[#2276] Added ChangeLog entry

diff --git a/ChangeLog b/ChangeLog
index 5eb3e9d454c87a9fcd4a3ced876b2a7d056ad773..372a7e7fb7408cae4324a4bd22f6ec4c2c2b4f9a 100644 (file)
--- 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