From: Aram Sargsyan <aram@isc.org>
Date: Tue, 3 May 2022 22:38:44 +0000 (+0000)
Subject: Add CHANGES and release note for [GL #2506]
X-Git-Tag: v9.19.3~60^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3191eabbc7452b9a77b7d8648054fc4d94b654e2;p=thirdparty%2Fbind9.git

Add CHANGES and release note for [GL #2506]
---

diff --git a/CHANGES b/CHANGES
index 1c5831d551c..53cac3182a3 100644
--- 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 0828578049e..19131f712b5 100644
--- 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`.