rebased and updated ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 05542e0ab9d587468af6b75a1ffb428ea89f4ed4..2b470c5dbd4621e01936903c328856fbc81afc81 100644 (file)
--- 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 27f46f8b58f4beeb7a11f34615ae62c9f7c64e7f..1793898ca9116f61339a1d96d0597dbe8a8e19c2 100644 (file)
--- 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"