From: Francis Dupont <fdupont@isc.org>
Date: Mon, 24 Apr 2017 11:42:53 +0000 (+0200)
Subject: [master] Finished merge of trac5186 (config-test vs unregister timers)
X-Git-Tag: trac5243x_base~4
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e891b06940e41b4cfaa324c2ace8fdd761ee6662;p=thirdparty%2Fkea.git

[master] Finished merge of trac5186 (config-test vs unregister timers)
---

diff --git a/ChangeLog b/ChangeLog
index c8a100d000..d223aae7eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
+1250.	[bug]		fdupont
+	Do not unregister timers when running the config-test command.
+	(Trac #5186, git xxx)
+
 1249.	[bug]		tmark
 	The assigned lease statistics were not being probably adjusted
 	by either kea-dhcp4 or kea-dhcp6 when reclaimed expired leases
 	were reissued.
-	(Trac #5247 git 4e5193fb32b14325ccf5824614e58bcceb3e6388)
+	(Trac #5247, git 4e5193fb32b14325ccf5824614e58bcceb3e6388)
 
 1248.	[bug]		marcin
 	Improved socket connection handling code, corrected numerous