From: Thomas Markwalder <tmark@isc.org>
Date: Wed, 31 Jul 2019 10:41:21 +0000 (-0400)
Subject: [#730,!2] Reworded ChangeLog entry
X-Git-Tag: Kea-1.6.0~41^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e8600f0aea9f0ab74f62a01e68167a3c7e243a6;p=thirdparty%2Fkea.git

[#730,!2] Reworded ChangeLog entry
---

diff --git a/ChangeLog b/ChangeLog
index abc3cd2835..f10e779be2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -178,6 +178,12 @@ Kea 1.6.0-beta2 released on July 24, 2019
 	Add support for associating subnets with the server tags in the
 	mysql_cb hooks library.
 	(Gitlab #717,!417, git e121ec4e0a04bc5bebdbfecf9cc1606b50e71263)
+=======
+16xx.	[bug]		tmark
+	Prevents DHCP servers from asserting when malformed hostname
+	or FQDN options are received.
+	(Gitlab #730,!2 git TBD)
+>>>>>>> [#730,!2] Reworded ChangeLog entry
 
 1618.	[func]		marcin
 	Add support for associating the shared networks with the server