From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 6 Jun 2023 15:01:32 +0000 (-0400)
Subject: [#2276] Added ChangeLog entry
X-Git-Tag: Kea-2.5.0~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ce369c4682e170d71c90fc4f68d8925934bde2e;p=thirdparty%2Fkea.git

[#2276] Added ChangeLog entry
---

diff --git a/ChangeLog b/ChangeLog
index 5eb3e9d454..372a7e7fb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2167.   [func]      tmark
+	The kea-dhcp<4/6> parameter, ddns-use-conflict-resolution,
+	has been deprecated and replaced with
+	ddns-conflict-resolution-mode.  The new parameter supports
+	four modes of behavior pertaining to DDNS update conflict
+	resolution: check-with-dhcid, no-check-with-dhcid,
+	check-exists-with-dhcid, and no-check-without-dhcid.
+	Thanks to Shawn Routhier from Infoblox for contributing
+	the patch to implement this feature.
+	(Gitlab #2276)
+
 Kea 2.4.0 (stable) released on July 05, 2023
 
 2166.	[build]		mgodzina