From: Razvan Becheriu <razvan@isc.org>
Date: Fri, 6 Sep 2019 06:31:01 +0000 (+0300)
Subject: rebased and updated ChangeLog
X-Git-Tag: Kea-1.7.0~33
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=9d001774132141ac71af3e497f953a298f87e5af;p=thirdparty%2Fkea.git

rebased and updated ChangeLog
---

diff --git a/ChangeLog b/ChangeLog
index 05542e0ab9..2b470c5dbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1659.	[bug]		razvan
+	Fix missing call of commitRuntimeOptionsDefs in v4 code and renamed
+	and reordered functions in unit tests.
+	(Gitlab #729, !434, git e5b68fb226161dcdef0e4d2d9d03d9bdb95af5e2)
+
 Kea 1.6.0 released on Aug 28, 2019
 
 1658.	[bug]		tmark
diff --git a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
index 27f46f8b58..1793898ca9 100644
--- a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
@@ -827,7 +827,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, configTest) {
         "           \"persist\":false, \n"
         "           \"lfc-interval\": 0  \n"
         "        }, \n"
-        "       \"expired-leases-processing\": { \n"
+        "        \"expired-leases-processing\": { \n"
         "            \"reclaim-timer-wait-time\": 0, \n"
         "            \"hold-reclaimed-time\": 0, \n"
         "            \"flush-reclaimed-timer-wait-time\": 0 \n"