From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 21 Feb 2019 18:39:16 +0000 (-0500)
Subject: [master] Added ChangeLog entry 1529.
X-Git-Tag: 397-cb-implement-mysqlconfigbackenddhcpv6_base~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab35bec717a02bfa886499fa66a121044e4ab13c;p=thirdparty%2Fkea.git

[master] Added ChangeLog entry 1529.
---

diff --git a/ChangeLog b/ChangeLog
index b1fa5023e4..cbc7ce80df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1529.	[func]		tmark
+	When fetching configuration data from configured backends, 
+	kea-dhcp4 will now merge global parameters.
+	(Gitlab #402,!224, git dadaf76f8dd61b8bb3405aa5dc80029f09b2d4ec)
+
 1528.	[func]		fdupont
 	Aligned DHCPv4 and DHCPv6 specific tables used by the MySQL Config
 	Backend. Extended MySQL schema to implement audit trail for the