Add CHANGES and release notes for [GL #3911]

(cherry picked from commit e1036253db90efbd17db0eef3b17e37d2db86176)

diff --git a/CHANGES b/CHANGES
index a487144934ad1ee8b7371cbe25ffc08668c0e735..f0ce6b7d6da671020cc500d0236a5fa4636bdc8d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+6119.  [bug]           Make sure to revert the reconfigured zones to the
+                       previous version of the view, when the new view
+                       reconfiguration fails during the configuration of
+                       one of the configured zones. [GL #3911]
+
 6116.  [bug]           Fix error path cleanup issues in dns_catz_new_zones()
                        and dns_catz_new_zone() functions. [GL #3900]
 

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index d4593b8044a8493effcdadac25850612ca1b3cef..deb913fe5b367ad434202ce16b42264635ef5545 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -65,7 +65,9 @@ Feature Changes
 Bug Fixes
 ~~~~~~~~~
 
-- None.
+- :iscman:`named` could crash with an assertion failure when adding a new zone
+  into the configuration file for a name, which is already configured as a
+  member zone for a catalog zone. This has been fixed. :gl:`#3911`
 
 Known Issues
 ~~~~~~~~~~~~