From: Thomas Markwalder <tmark@isc.org>
Date: Wed, 20 Feb 2019 16:40:28 +0000 (-0500)
Subject: [master] Added missing ChangeLog entry for #399.
X-Git-Tag: 397-cb-implement-mysqlconfigbackenddhcpv6_base~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34f51cce4c079e5f002e1ad958e4d21d490cda2d;p=thirdparty%2Fkea.git

[master] Added missing ChangeLog entry for #399.
---

diff --git a/ChangeLog b/ChangeLog
index d69290630e..5a07825e80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1526.	[func]		tmark
+	In addition to subnets, when fetching configuration data from
+	configured backends, kea-dhcp4 will now merge shared-networks.
+	(Gitlab #399,!215, git 6b57b6b5d678c91b6b380fbe08beafd06b0e7b1d)
+
 1525.	[func]		fdupont
 	Defined API for the DHCPv6 Configuration Backend.
 	(Gitlab #458,!231, git f16e03d9bf1c10903c16b2614223b10880f73d50)