Skip to content
  • Yoshitaka Aharen's avatar
    Merge branch 'trac2157_2' into trac2157_merge · 5a6d38e1
    Yoshitaka Aharen authored
    Conflicts:
    	ChangeLog
    	configure.ac
    	src/bin/auth/Makefile.am
    	src/bin/auth/auth_srv.cc
    	src/bin/auth/auth_srv.h
    	src/bin/auth/b10-auth.xml.pre
    	src/bin/auth/statistics.cc
    	src/bin/auth/statistics.h
    	src/bin/auth/statistics_items.h
    	src/bin/auth/tests/Makefile.am
    	src/bin/auth/tests/auth_srv_unittest.cc
    	src/bin/auth/tests/statistics_unittest.cc
    	src/lib/statistics/counter.h
    	src/lib/statistics/counter_dict.h
    	tests/lettuce/configurations/example.org.inmem.config
    5a6d38e1