From: Tomek Mrugalski <tomasz@isc.org>
Date: Mon, 11 Feb 2013 14:54:27 +0000 (+0100)
Subject: [master] Merge branch 'trac2702' (DHCPv4 renewal without client-id)
X-Git-Tag: bind10-1.0.0-rc-release~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52f22bb0132d78d07145fec0f1fde03069f7e5fa;p=thirdparty%2Fkea.git

[master] Merge branch 'trac2702' (DHCPv4 renewal without client-id)

Conflicts:
	ChangeLog
---

52f22bb0132d78d07145fec0f1fde03069f7e5fa
diff --cc ChangeLog
index b835d41ea3,2bbdaff83a..4c0dcdacd3
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
 -5XX.	[bug]		marcin,tomek,tmark
++570.	[bug]		tmark, marcin, tomek
+ 	b10-dhcp4: Address renewal now works properly for DHCPv4 clients
+ 	that do not send client ID.
+ 	(Trac #2702, git daf2abe68ce9c111334a15c14e440730f3a085e2)
+ 
 +569.	[bug]		tomek
 +	b10-dhcp4: Fix bug whereby a DHCP packet without a client ID
 +	could crash the MySQL lease database backend.
 +	(Trac #2697, git b5e2be95d21ed750ad7cf5e15de2058aa8bc45f4)
 +
  568.	[func]          muks
  	Various message IDs have been renamed to remove the word 'ERROR'
  	from them when they are not logged at ERROR severity level.