From d868d9b3bf0c2244fa429f8a34ab3b75c6c319a2 Mon Sep 17 00:00:00 2001
From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 27 Mar 2019 21:31:44 +0100
Subject: [PATCH] [master] Added ChangeLog entry for #490.

---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0e90ecdd30..590b258948 100644
--- 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.
-- 
2.47.2