Add CHANGES and release note for [GL #4386]

diff --git a/CHANGES b/CHANGES
index 46bca3cfb2c0ce70bb4f5d49792c4ad54c23f095..7ab6f6b1df68135960f472a913ea6ad5533c287a 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 4bec73ae315fd3a579ee96ab948798cb28a44d3b..5fd0f69c05d8d85c079b6516ba9902c384f223af 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -65,6 +65,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
 ~~~~~~~~~~~~