[master] Added ChangeLog entry 1529.

diff --git a/ChangeLog b/ChangeLog
index b1fa5023e4ac77b6f71acc3144c8a96aef845929..cbc7ce80df602565d0f698b70946dc1af10d6203 100644 (file)
--- 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