From: Evan Hunt <each@isc.org>
Date: Wed, 3 May 2023 21:34:39 +0000 (-0700)
Subject: CHANGES and release note for part 2 of [GL #4046]
X-Git-Tag: v9.19.14~53^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=0ee38f905f43c64f15c02dda2f89a7e575a67b91;p=thirdparty%2Fbind9.git

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

diff --git a/CHANGES b/CHANGES
index 08f71da2e7a..34fe56bce24 100644
--- 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 654d4318b96..1caedbbaa9a 100644
--- 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
 ~~~~~~~~~~~~~~~~