From c678065eaaac20d5fb4d354c101b6e702f85ba0e Mon Sep 17 00:00:00 2001
From: Matthijs Mekking <matthijs@isc.org>
Date: Mon, 10 Jan 2022 17:45:00 +0100
Subject: [PATCH] Add CHANGE and release note for #2931

Release note worthy.

(cherry picked from commit ebbcf4c34fc53a1d7e286d1f9cf2741bd688e03d)
---
 CHANGES                     | 3 +++
 doc/notes/notes-current.rst | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index b14f754984..922acf6f01 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5858.	[bug]		Don't remove CDS/CDNSKEY DELETE records on zone sign
+			when using 'auto-dnssec maintain;'. [GL #2931]
+
 5856.	[bug]		The "starting maxtime timer" message related to outgoing
 			zone transfers was incorrectly logged at the ERROR level
 			instead of DEBUG(1). [GL #3208]
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 8aaede7f0e..3181c29668 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -40,4 +40,5 @@ Feature Changes
 Bug Fixes
 ~~~~~~~~~
 
-- None.
+- CDS and CDNSKEY DELETE records are removed from the zone when configured with
+  'auto-dnssec maintain;'. This has been fixed. :gl:`#2931`.