Add CHANGES and release note for [GL #4386]

(cherry picked from commit 8294a43acfc2e796be8bee3e7e311162e6a4047d)

diff --git a/CHANGES b/CHANGES
index 0c7750696993adcd1681c75534ab2d3a07ae2eaa..6377ddedb2bac4473fb2bdfb27f4d469e15edebd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6275.  [bug]           Fix assertion failure when using lock-file configuration
+                       option together -X argument to named. [GL #4386]
+
 6274.  [bug]           The 'lock-file' file was being removed when it
                        shouldn't have been making it ineffective if named was
                        started 3 or more times. [GL #4387]

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index b857f117a3860438028f4fd0f93c99faed67e6a5..4c1c950fc1531ebb9c38ad3bb56a82ba2cb75016 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -43,6 +43,9 @@ Bug Fixes
   have been making it ineffective if named was started 3 or more
   times. :gl:`#4387`
 
+- 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`
+
 Known Issues
 ~~~~~~~~~~~~