From: Naoki Kambe <kambe@jprs.co.jp>
Date: Mon, 19 Mar 2012 02:43:36 +0000 (+0900)
Subject: Merge branch 'trac1751'
X-Git-Tag: trac2351_base~226^2~116^2~100^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3285353a660e881ec2b645e1bc10d94e5020f357;p=thirdparty%2Fkea.git

Merge branch 'trac1751'

Conflicts:
	ChangeLog
---

3285353a660e881ec2b645e1bc10d94e5020f357
diff --cc ChangeLog
index d1e218ba4b,c670d3bdec..0241be3cf7
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,9 +1,22 @@@
+ xxx.	[bug]		naokikambe
+ 	The statistic counters are now properly accumulated across multiple
+ 	instances of b10-auth (if there are multiple instances), instead of
+ 	providing result for random instance.
+ 	(Trac #1751, git TBD)
+ 
 +403.	[build]*	jelte
 +	The configure option for botan (--with-botan=PATH) is replaced by
 +	--with-botan-config=PATH, which takes a full path to a botan-config
 +	script, instead of the botan 'install' directory. Also, if not
 +	provided, configure will try out config scripts and pkg-config
 +	options until it finds one that works.
 +	(Trac #1640, git 582bcd66dbd8d39f48aef952902f797260280637)
 +
 +402.	[func]		jelte
 +	b10-xfrout now has a visible command to send out notifies for
 +	a given zone, callable from bindctl. Xfrout notify <zone> [class]
 +	(Trac #1321, git 0bb258f8610620191d75cfd5d2308b6fc558c280)
 +
  401.	[func]*		jinmei
  	libdns++: updated the internal implementation of the
  	MessageRenderer class.  This is mostly a transparent change, but