Add release note and CHANGES for #4355

(cherry picked from commit ac19d43a328cc47e19f9843ab9318951d6a3eee2)

diff --git a/CHANGES b/CHANGES
index 6377ddedb2bac4473fb2bdfb27f4d469e15edebd..7f394d8df4bc0478f22e1fff5aafaee6cc9bb3cf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6277.  [bug]           Take into account local authoritative zones when
+                       falling back to serve-stale. [GL #4355]
+
 6275.  [bug]           Fix assertion failure when using lock-file configuration
                        option together -X argument to named. [GL #4386]
 

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 4c1c950fc1531ebb9c38ad3bb56a82ba2cb75016..81dff9bf241359366cc876cf5fd0e933320a2104 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -46,6 +46,9 @@ Bug Fixes
 - When :any:`lock-file` was used at the same time as :option:`named -X`, the
   assertion failure would be triggered.  This has been fixed. :gl:`#4386`
 
+- Looking up stale data from the cache did not take into account local
+  authoritative zones. This has been fixed. :gl:`#4355`
+
 Known Issues
 ~~~~~~~~~~~~