From: Francis Dupont <fdupont@isc.org>
Date: Wed, 17 Feb 2021 12:11:00 +0000 (+0100)
Subject: [#1662] Fixed rebase
X-Git-Tag: Kea-1.9.5~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b152ac55141e7cbeb334ca9a2192c900db32425;p=thirdparty%2Fkea.git

[#1662] Fixed rebase
---

diff --git a/ChangeLog b/ChangeLog
index 2348f3c0b3..bee9c76347 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,4 @@
 1864.	[func]		fdupont
-	New parameters to handle upcoming TLS support added in
-	Control Agent config: "trust-anchor", "cert-file",
-	"key-file" and "cert-required". They can be configured,
-	but their values are not used yet. This will be
-	implemented in a future ticket.
-
-1863.	[func]		fdupont
 	New parameters to handle TLS support added in Control Agent
 	config: "trust-anchor", "cert-file", "key-file" and
 	"cert-required". They can be configured, but their values are