Add CHANGES and release note for [GL #2506]

diff --git a/CHANGES b/CHANGES
index 1c5831d551cd136990cf05f15d47e7cf4b1979df..53cac3182a3518ecd9b7f12716d0575ea0c9bb27 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5901.  [bug]           When processing a catalog zone member zone make sure
+                       that there is no configured pre-existing forward-only
+                       forward zone with that name. [GL #2506]
+
 5900.  [placeholder]
 
 5899.  [func]          Don't try to process DNSSEC-related and ZONEMD records

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 0828578049e245867ee6313a4de5af9e37a5eb83..19131f712b5baeba198761326280360ad1db01ed 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -40,4 +40,6 @@ Feature Changes
 Bug Fixes
 ~~~~~~~~~
 
-- None.
+- It was possible for a catalog zone consumer to process a catalog zone member
+  zone when there was a configured pre-existing forward-only forward zone with
+  the same name. This has been fixed. :gl:`#2506`.