From 3be1e559dce42a58a36f17fb1e784de7ca297f4f Mon Sep 17 00:00:00 2001
From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 19 Sep 2022 19:33:00 +0200
Subject: [PATCH] [#2408] Added ChangeLog for #2408

---
 ChangeLog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a6c256bc75..608bec3f71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2059.	[func]         marcin
+	The lease_cmds hook library returns a new "conflict" status
+	code indicating an issue with a lease update due to a mismatch
+	between the received lease and the server's configuration or
+	state. The HA hook library differentiates between this new
+	status and a general error and avoids transitioning to the
+	partner-down state when conflicts occur. The new
+	"max-rejected-lease-updates" parameter sets a limit for the
+	maximum number of conflicts before the server terminates the
+	HA service.
+	(Gitlab #2408)
+
 2058.	[build]		fdupont
 	kea-lfc is now built just after libraries.
 	(Gitlab #2526)