[master] Added ChangeLog entry for #490.

diff --git a/ChangeLog b/ChangeLog
index 0e90ecdd30a9351a32c1b9a8b2689cd98b40a8d8..590b258948e623a5e35350c79e0e64c1d383e397 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1550.  [func]          marcin
+       Implemented inheritance of the DHCPv4 global and shared network
+       specific configuration parameters when using configuration
+       backend.
+       (Gitlab #490,!284, git 2508f942e879ef74b20c07ffdba37d187d6ea932)
+
 1549.  [func]          tmark
        kea-dhcp6 can now be configured to fetch data from configuration
        back ends. It does not yet utilize the data fetched.