Add CHANGES and release notes for [GL #2308]

diff --git a/CHANGES b/CHANGES
index 986cc9058d36528e774c0554419688bd9651a4bd..7b37b4037a608862f2e4bb8d3ca75a5c56db5902 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5727.  [bug]           Ignore the missing zones when doing a reload on a
+                       catalog zone, and make sure to restore them later on.
+                       [GL #2308]
+
 5726.  [bug]           Fix heap use after free when cheking for "http"
                        clauses duplicates. [GL #2924]
 

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 46c66f04adaef8c55993143c4cbeb8b3d65d22d9..5bd4f71b0b865f386c97fa6017754be86ee52068 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -65,3 +65,6 @@ Bug Fixes
 
 - Under specific circumstances, zone transfers over TCP and TLS could be
   interrupted prematurely. This has been fixed. :gl:`#2917`
+
+- Reloading a catalog zone that referenced a missing/deleted zone
+  caused a crash. This has been fixed. :gl:`#2308`