From: Tony Finch <dot@dotat.at>
Date: Wed, 22 Jan 2020 19:11:56 +0000 (+0000)
Subject: Add CHANGES and release note for [GL !2946]
X-Git-Tag: v9.17.18~31^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9557d6f70f41bedb73f468049316f18c9ec5a7ed;p=thirdparty%2Fbind9.git

Add CHANGES and release note for [GL !2946]
---

diff --git a/CHANGES b/CHANGES
index 07c9cf3b082..8225feacac9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5697.	[protocol]	SHA-1 CDS records are no longer used by dnssec-cds to
+			make DS records. Thanks to Tony Finch. [GL !2946]
+
 5696.	[protocol]	Add support for HTTPS and SVCB record types. [GL #1132]
 
 5695.	[func]		Dig can now display the BADCOOKIE message as part of
@@ -1452,7 +1455,7 @@
 5349.	[bug]		Fix a race in task_pause/unpause. [GL #1571]
 
 5348.	[bug]		dnssec-settime -Psync was not being honoured.
-			[GL !2893]
+			Thanks to Tony Finch. [GL !2893]
 
 	--- 9.15.8 released ---
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index a83a17c5ea0..61dec801658 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -39,6 +39,9 @@ Feature Changes
   key. This allows for a gradual replacement of RRSIGs as they reach expiry.
   :gl:`#1551`
 
+- SHA-1 CDS records are no longer used by ``dnssec-cds`` to make DS
+  records. Thanks to Tony Finch. :gl:`!2946`
+
 Bug Fixes
 ~~~~~~~~~