From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 19 Aug 2014 18:30:56 +0000 (+0200)
Subject: [master] Merge branch 'trac3518' (Compilation fixes for 0.9 beta1)
X-Git-Tag: trac3482_base~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f67ccb13ee73648443c5dafbef6ca6e699e14f2;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3518' (Compilation fixes for 0.9 beta1)

Conflicts:
	ChangeLog
---

0f67ccb13ee73648443c5dafbef6ca6e699e14f2
diff --cc ChangeLog
index 5dd0d85395,463ee08181..b052e7b845
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,5 +1,15 @@@
 +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
  	refer to BIND10 project. As a result of renaming the B10_CXXFLAGS