From: Matthijs Mekking <matthijs@isc.org>
Date: Thu, 21 Oct 2021 14:48:38 +0000 (+0200)
Subject: Add release note and CHANGES for #2742
X-Git-Tag: v9.17.20~24^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3507207d410ee1d4eed130ac2c6250cc865ee20;p=thirdparty%2Fbind9.git

Add release note and CHANGES for #2742

Feature change.
---

diff --git a/CHANGES b/CHANGES
index d76f0d8c697..335b035f517 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5747.	[func]		Update rndc serve-stale status output to be less
+			confusing. [GL #2742]
+
 5746.	[bug]		A lame server delegation could lead to a loop in which
 			a resolver fetch depends on an ADB find which depends
 			on the same resolver fetch. Previously, this would
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 28127fb2e77..d6ff6c133db 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -96,6 +96,11 @@ Feature Changes
   is set to ``no`` add to the DNS response payload without offering added value.
   :gl:`#1316`
 
+- The output of ``rndc serve-stale status`` has been clarified. It now
+  explicitly reports whether retention of stale data in the cache is enabled
+  (``stale-cache-enable``), and whether returning of such data in responses is 
+  enabled (``stale-answer-enable``). :gl:`#2742`
+
 Bug Fixes
 ~~~~~~~~~