From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 28 Feb 2019 13:28:56 +0000 (-0500)
Subject: [master] Added ChangeLog entry 1531.
X-Git-Tag: 478-improve-error-message-database-backend-mysql_base~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c26f5f8cd663eabd5a00ed4f6ea1f7432772c54a;p=thirdparty%2Fkea.git

[master] Added ChangeLog entry 1531.
---

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.