From: Razvan Becheriu <razvan@isc.org>
Date: Thu, 5 Nov 2020 16:25:21 +0000 (+0200)
Subject: [#1488] fixed rebase
X-Git-Tag: Kea-1.8.1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0c5b83867269ca5699f07ca248ef448626e5b25;p=thirdparty%2Fkea.git

[#1488] fixed rebase
---

diff --git a/ChangeLog b/ChangeLog
index 3b48f1f05b..95c9e09bff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 	expiration time is different than what it is already stored, to
 	act as a protection mechanism for parallel updates from several
 	threads or processes.
+	(Gitlab #1434,#1488)
 
 1799.	[bug]		tmark
 	kea-dhcp4 now correctly updates DNS when a client
@@ -19,7 +20,6 @@
 	Removed "Multithreading is experimental" warning log message
 	from kea-dhcp4 and kea-dhcp6 servers.
 	(Gitlab #1435,#1431)
-	(Gitlab #1434,#1488)
 
 Kea 1.8.0 (stable) released on Aug 26, 2020