From 18df93e23c2e45f093ff71e85fd89235bca0d635 Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 26 Mar 2021 15:00:41 +0100
Subject: [PATCH] dnsdist: Add ChangeLog and secpoll update for 1.6.0-alpha3

---
 docs/secpoll.zone                   |  5 ++-
 pdns/dnsdistdist/docs/changelog.rst | 65 +++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/docs/secpoll.zone b/docs/secpoll.zone
index 4c0979bdf6..294627e974 100644
--- a/docs/secpoll.zone
+++ b/docs/secpoll.zone
@@ -1,4 +1,4 @@
-@       86400   IN  SOA pdns-public-ns1.powerdns.com. pieter\.lexis.powerdns.com. 2021032600 10800 3600 604800 10800
+@       86400   IN  SOA pdns-public-ns1.powerdns.com. pieter\.lexis.powerdns.com. 2021032901 10800 3600 604800 10800
 @       3600    IN  NS  pdns-public-ns1.powerdns.com.
 @       3600    IN  NS  pdns-public-ns2.powerdns.com.
 
@@ -390,4 +390,5 @@ dnsdist-1.5.0-rc4.security-status                          60 IN TXT "2 Unsuppor
 dnsdist-1.5.0.security-status                              60 IN TXT "1 OK"
 dnsdist-1.5.1.security-status                              60 IN TXT "1 OK"
 dnsdist-1.6.0-alpha1.security-status                       60 IN TXT "2 Unsupported pre-release (no known vulnerabilities)"
-dnsdist-1.6.0-alpha2.security-status                       60 IN TXT "1 OK"
+dnsdist-1.6.0-alpha2.security-status                       60 IN TXT "2 Unsupported pre-release (no known vulnerabilities)"
+dnsdist-1.6.0-alpha3.security-status                       60 IN TXT "1 OK"
diff --git a/pdns/dnsdistdist/docs/changelog.rst b/pdns/dnsdistdist/docs/changelog.rst
index cfc8be0117..8d29c0c50c 100644
--- a/pdns/dnsdistdist/docs/changelog.rst
+++ b/pdns/dnsdistdist/docs/changelog.rst
@@ -1,6 +1,71 @@
 Changelog
 =========
 
+.. changelog::
+  :version: 1.6.0-alpha3
+  :released: 29th of March 2021
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 10156
+
+    Improve TCP connection reuse, add metrics
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 10161
+    :tickets: 7591
+
+    Using DATA to report memory usage is unreliable, start using RES instead, as it seems reliable and relevant
+
+  .. change::
+    :tags: Improvements, DNS over HTTPS, DNS over TLS
+    :pullreq: 10179
+
+    Set OpenSSL to release buffers when idle, saves 35 kB per connection
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 10184
+
+    Add a metric for TCP listen queue full events
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 10201
+
+    Fix the TCP connect timeout, add metrics
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 10204
+
+    Enable sharding by default, greater pipe buffer sizes
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 10207
+
+    Add limits for cached TCP connections, metrics
+
+  .. change::
+    :tags: Bug Fixes, DNS over HTTPS
+    :pullreq: 10208
+
+    Fix the handling of DoH queries with a non-zero ID
+
+  .. change::
+    :tags: Improvements, DNSCrypt, DNS over HTTPS, DNS over TLS
+    :pullreq: 10214
+
+    Unify certificate reloading syntaxes
+
+  .. change::
+    :tags: Improvements, DNS over HTTPS, DNS over TLS
+    :pullreq: 10218
+
+    Disable TLS renegotiation by default
+
 .. changelog::
   :version: 1.6.0-alpha2
   :released: 4th of March 2021
-- 
2.47.2