Add CHANGES and release note for GL #3049

This is a bugfix worth mentioning.

(cherry picked from commit f3e668d630b2b9de767f68af409119a7d1a8a51c)

diff --git a/CHANGES b/CHANGES
index 78280900e6ec5005cfda9ac89da11911ec200633..729300002dc851d9a9e351adf9f5f8487f51b2c6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5789.  [bug]           Allow replacing expired zone signatures with
+                       signatures created by the KSK. [GL #3049]
+
 5788.  [bug]           An assertion could occur if a catalog zone event was
                        scheduled while the task manager was being shut
                        down. [GL #3074]

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 0515049dfba7b2c17eff3ef3bdf40f6eb31f6e53..f2baa5b99e9876d595e43ffecc08fe2f7862ea7d 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -41,6 +41,10 @@ Feature Changes
 Bug Fixes
 ~~~~~~~~~
 
+- If signatures created by the ZSK are expired, and the ZSK private key is offline,
+  allow the expired signatures to be replaced with signatures created by the KSK.
+  :gl:`#3049`
+
 - On FreeBSD, a TCP connection would leak a small amount of heap memory leading
   to out-of-memory problem in a long run. This has been fixed. :gl:`#3051`