CHANGES and release note for part 2 of [GL #4046]

diff --git a/CHANGES b/CHANGES
index 08f71da2e7ab76a53bbdfb927dd358cd2e7b9830..34fe56bce244f834bac2bc3746a0742c2e164ae0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+6170.  [func]          The 'rndc -t' option allows a timeout to be set in
+                       seconds, so that commands that take a long time to
+                       complete (e.g., reloading a very large configuration)
+                       can be given time to do so. The default is 60
+                       seconds. [GL #4046]
+
 6169.  [bug]           named could crash when deleting inline-signing zones
                        with "rndc delzone". [GL #4054]
 

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 654d4318b96d6e57a6d5d669241bc46a31cb41fa..1caedbbaa9a3453a9762488c6be5940ed8d7fa51 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -24,6 +24,10 @@ New Features
   allows you to enable or disable the publication of CDNSKEY records.
   :gl:`#4050`
 
+- The read timeout in ``rndc`` can now be specified on the command line
+  using the ``-t`` option, allowing commands that take a long time to
+  complete sufficient time to do so. :gl:`#4046`
+
 Removed Features
 ~~~~~~~~~~~~~~~~