From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 10 May 2016 14:48:01 +0000 (+0200)
Subject: [master] ChangeLog updated after 4112 merge.
X-Git-Tag: trac4106_update_base~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b20d5e68d8a48534ce33fbc8141ee8d450b0b236;p=thirdparty%2Fkea.git

[master] ChangeLog updated after 4112 merge.
---

diff --git a/ChangeLog b/ChangeLog
index f0b227c064..3487778d55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-1112.   [bug]       tmark
+1113.	[func]		tomek
+	DHCPv4 subnet selection can now be selected based on IPv6
+	information. This is part of ongoing effort to support RFC7341:
+	DHCPv4-over-DHCPv6.
+	(Trac #4112, git 3352685981ec8ca9a90f7405ff56cd31af6fb0d9)
+
+1112.   [bug]		tmark
 	An explicit call to unload the hook libraries prior to server
 	exit was added to both kea-dhcp6 and kea-dhcp4.  This corrects
 	an issue where loggging components were being destroyed prior