summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorYoshitaka Aharen <aharen@jprs.co.jp>2013-02-06 09:40:34 +0100
committerYoshitaka Aharen <aharen@jprs.co.jp>2013-02-06 09:40:34 +0100
commit5a6d38e1f78650477176b1cd8424227382621c7a (patch)
tree1f6770a47da2b144bebd17d627e18ce7aeb43eca /ChangeLog
parent[master] Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10 (diff)
parent[2157] add a comment for lettuce test: check for Auth receives 'getstats' (diff)
downloadkea-5a6d38e1f78650477176b1cd8424227382621c7a.tar.xz
kea-5a6d38e1f78650477176b1cd8424227382621c7a.zip
Merge branch 'trac2157_2' into trac2157_merge
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
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 771f4c2f0d..1506747d12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+TBD. [func]* y-aharen
+ Added statistics items in b10-auth based on
+ http://bind10.isc.org/wiki/StatisticsItems. Qtype counters are
+ dropped as it requires further spec design discussion.
+ (Trac #2154, Trac #2155,
+ git 61d7c3959eb991b22bc1c0ef8f4ecb96b65d9325)
+ (Trac #2157, git TBD)
+
565. [func]* jelte
The main initializer script (formerly known as either 'bind10',
'boss', or 'bob'), has been renamed to b10-init (and Init in