[master] Added ChangeLog entry 1531.

diff --git a/ChangeLog b/ChangeLog
index b9487dc6b1143b644bef1b00390da7ad0355f700..501183b30ee3b382969e431e004b82033312b1e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1531.  [func]          tmark
+       When fetching configuration data from configured backends, 
+       kea-dhcp4 will now merge option definitions.
+       (Gitlab #400,!243, git 0c5d1417031e49bd0c247889989e187db2dd8f4b)
+
 1530.  [bug]           adwol
        Potential syntax error in keactrl fixed. Thanks to Adam Osuchowski
        from Silesian University of Technology for providing a patch.