From: Otto <otto.moerbeek@open-xchange.com>
Date: Tue, 16 Nov 2021 13:10:44 +0000 (+0100)
Subject: Prep for rec-4.6.0-beta2
X-Git-Tag: dnsdist-1.7.0-beta2~21^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10992%2Fhead;p=thirdparty%2Fpdns.git

Prep for rec-4.6.0-beta2
---

diff --git a/docs/secpoll.zone b/docs/secpoll.zone
index b3df19187d..d928bc48c9 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. 2021111601 10800 3600 604800 10800
+@       86400   IN  SOA pdns-public-ns1.powerdns.com. pieter\.lexis.powerdns.com. 2021111701 10800 3600 604800 10800
 @       3600    IN  NS  pdns-public-ns1.powerdns.com.
 @       3600    IN  NS  pdns-public-ns2.powerdns.com.
 
@@ -281,6 +281,7 @@ recursor-4.5.7.security-status                          60 IN TXT "1 OK"
 recursor-4.6.0-alpha1.security-status                   60 IN TXT "1 Unsupported pre-release"
 recursor-4.6.0-alpha2.security-status                   60 IN TXT "1 Unsupported pre-release"
 recursor-4.6.0-beta1.security-status                    60 IN TXT "1 Unsupported pre-release"
+recursor-4.6.0-beta2.security-status                    60 IN TXT "1 Unsupported pre-release"
 
 ; Recursor Debian
 recursor-3.6.2-2.debian.security-status                 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
diff --git a/pdns/recursordist/docs/changelog/4.6.rst b/pdns/recursordist/docs/changelog/4.6.rst
index 4ff5b16dd7..1804a28309 100644
--- a/pdns/recursordist/docs/changelog/4.6.rst
+++ b/pdns/recursordist/docs/changelog/4.6.rst
@@ -1,6 +1,30 @@
 Changelogs for 4.6.X
 ====================
 
+.. changelog::
+  :version: 4.6.0-beta2
+  :released: 17th of November 2021
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 10980
+    :tickets: 10936
+
+    Return the proper extended error code on specific validation failures.
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 10751
+    :tickets: 7014
+
+    Add support for NOTIFY queries to wipe cache entries (Kevin P. Fleming).
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 10971
+
+    We need a libcurl dev lib for the zone-to-cache function.
+
 .. changelog::
   :version: 4.6.0-beta1
   :released: 9th of November 2021
diff --git a/pdns/recursordist/docs/upgrade.rst b/pdns/recursordist/docs/upgrade.rst
index 6cdd9d6848..15b6ec3048 100644
--- a/pdns/recursordist/docs/upgrade.rst
+++ b/pdns/recursordist/docs/upgrade.rst
@@ -20,6 +20,7 @@ New settings
 - The :ref:`setting-tcp-out-max-idle-ms`, :ref:`setting-tcp-out-max-idle-per-auth`, :ref:`setting-tcp-out-max-queries` and :ref:`setting-tcp-out-max-idle-per-thread` settings have been introduced to control the new TCP/DoT outgoing connections pooling. This mechanism keeps connections to authoritative servers or forwarders open for later re-use.
 - The :ref:`setting-structured-logging` setting has been introduced to prefer structured logging (the default) when both an old style and a structured log messages is available.
 - The :ref:`setting-max-include-depth` setting has been introduced to limit the number of nested ``$include`` directives while processing a zone file.
+- The :ref:`setting-allow-notify-for`, :ref:`setting-allow-notify-for-file`, :ref:`setting-allow-notify-from` and :ref:`setting-allow-notify-from-file` settings have been introduced, allowing incoming notify queries to clear cache entries.
 
 Deprecated and changed settings
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^