From c26f5f8cd663eabd5a00ed4f6ea1f7432772c54a Mon Sep 17 00:00:00 2001
From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 28 Feb 2019 08:28:56 -0500
Subject: [PATCH] [master] Added ChangeLog entry 1531.

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

diff --git a/ChangeLog b/ChangeLog
index b9487dc6b1..501183b30e 100644
--- 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.
-- 
2.47.3