From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Wed, 26 Sep 2012 14:56:01 +0000 (+0200)
Subject: Merge #2189
X-Git-Tag: trac2351_base~37^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52177bb31f5fb8e134aecb9fd039c368684ad2df;p=thirdparty%2Fkea.git

Merge #2189

Conflicts:
	ChangeLog
---

52177bb31f5fb8e134aecb9fd039c368684ad2df
diff --cc ChangeLog
index 595f8ae409,474f47a8b6..fb4b591b67
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,7 +1,25 @@@
 -478.	[doc]		vorner
++480.	[doc]		vorner
+ 	Added documentation about global TSIG key ring to the Guide.
+ 	(Trac #2189, git ....)
+ 
 +479.	[func]		marcin
 +	Refactored perfdhcp tool to C++, added missing unit tests and removed
 +	the old code. The new code uses libdhcp++ (src/lib/dhcp) for DHCP
 +	packet management, network interface management and packet transmission.
 +	(Trac #1954, git 8d56105742f3043ed4b561f26241f3e4331f51dc)
 +	(Trac #1955, git 6f914bb2c388eb4dd3e5c55297f8988ab9529b3f)
 +	(Trac #1956, git 6f914bb2c388eb4dd3e5c55297f8988ab9529b3f)
 +	(Trac #1957, git 7fca81716ad3a755bf5744e88c3adeef15b04450)
 +	(Trac #1958, git 94e17184270cda58f55e6da62e845695117fede3)
 +	(Trac #1959, git a8cf043db8f44604c7773e047a9dc2861e58462a)
 +	(Trac #1960, git 6c192e5c0903f349b4d80cf2bb6cd964040ae7da)
 +
 +478.	[func]		naokikambe
 +	New statistics items added into b10-xfrout: ixfr_running and
 +	axfr_running.  Their values can be obtained by invoking "Stats show
 +	Xfrout" via bindctl while b10-xfrout is running.
 +	(Trac #2222, git 91311bdbfea95f65c5e8bd8294ba08fac12405f1)
 +
  477.	[bug]		jelte
  	Fixed a problem with b10-msgq on OSX when using a custom Python
  	installation, that offers an unreliable select.poll() interface.