From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 19 Aug 2014 18:37:54 +0000 (+0200)
Subject: [master] Merge branch 'trac3509' (query_cmp removed from tools)
X-Git-Tag: trac3482_base~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1fd08bc119876d138fbdf69821b66ab94c93b56;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3509' (query_cmp removed from tools)

Conflicts:
	ChangeLog
---

d1fd08bc119876d138fbdf69821b66ab94c93b56
diff --cc ChangeLog
index 48c783d285,e101ef3554..7a1aecd276
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,18 -1,6 +1,23 @@@
 -8XX.	[build]		tomek
++
++823.	[build]		tomek
+ 	query_cmp tool removed from the source code.
 -	(Trac #3509, git TBD)
++	(Trac #3509, git f61c800059bd5e5c74e435d7dd97ae561d29151a)
++
 +822.	[build]		tomek
 +	'host' program was removed from examples.
 +	(Trac #3421, git aeea893fb1c52d20258929a62a59ae2e7bd12e3d)
 +
 +821.	[bug]		marcin
 +	DHCP servers no longer log an error when Interface Manager fails to
 +	receive a packet as a result of signal being received.
 +	(Trac #3478, git d80c83aef8e103dd483234429d35aeb66149e0b9)
 +
 +820.	[bug]		marcin
 +	Corrected the IfaceMgrTest.detectIfaces unit test which reported
 +	false positives for specific network configurations.
 +	(Trac #3517, git 9affa1b2210f5cc9d7a99724e5d5c8979409cefd)
 +
 +Kea 0.9beta1 released on August 13, 2014
  
  819.	[build]		marcin
  	Renamed variables in the configure.ac so as their names do not