Merge pull request #7923 from Habbie/auth-4.1.9-changelog

auth 4.1.9: changelog; secpoll; superslave setting revisionist history

diff --git a/docs/changelog/4.1.rst b/docs/changelog/4.1.rst
index 94cfe8f649bb429f1abff6d26014b7a489aa5f42..937f821b72c582e34107515106ed9d886d1d066f 100644 (file)
--- a/docs/changelog/4.1.rst
+++ b/docs/changelog/4.1.rst
@@ -1,6 +1,22 @@
 Changelogs for 4.1.x
 ====================
 
+.. changelog::
+  :version: 4.1.9
+  :released: June 19th 2019
+
+  .. change::
+    :tags: Performance
+    :pullreq: 7922
+
+    Add an option to disable superslaving.
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 7921
+
+    In gsql ``getAllDomainMetadata``, actually get all domain metadata. This makes DNSSEC metadata work with ``pdnsutil b2b-migrate``.
+
 .. changelog::
   :version: 4.1.8
   :released: March 22nd 2019

diff --git a/docs/secpoll.zone b/docs/secpoll.zone
index ce22db74a9866ebb176b526caf24d8f50fa7a313..7d9d0c2bdf8476b858f88ad85075526a468d0410 100644 (file)
--- a/docs/secpoll.zone
+++ b/docs/secpoll.zone
@@ -1,4 +1,4 @@
-@       86400   IN  SOA pdns-public-ns1.powerdns.com. pieter\.lexis.powerdns.com. 2019061401 10800 3600 604800 10800
+@       86400   IN  SOA pdns-public-ns1.powerdns.com. pieter\.lexis.powerdns.com. 2019061801 10800 3600 604800 10800
 @       3600    IN  NS  pdns-public-ns1.powerdns.com.
 @       3600    IN  NS  pdns-public-ns2.powerdns.com.
 ; Auth
@@ -45,6 +45,7 @@ auth-4.1.5.security-status                              60 IN TXT "3 Upgrade now
 auth-4.1.6.security-status                              60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/authoritative/security-advisories/powerdns-advisory-2019-03.html"
 auth-4.1.7.security-status                              60 IN TXT "1 OK"
 auth-4.1.8.security-status                              60 IN TXT "1 OK"
+auth-4.1.9.security-status                              60 IN TXT "1 OK"
 auth-4.2.0-alpha1.security-status                       60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/authoritative/security-advisories/powerdns-advisory-2019-03.html"
 auth-4.2.0-beta1.security-status                        60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/authoritative/security-advisories/powerdns-advisory-2019-03.html"
 auth-4.2.0-rc1.security-status                          60 IN TXT "1 OK"

diff --git a/docs/settings.rst b/docs/settings.rst
index 50fa520f03511a54d9ae1aaa6932dbccea86382f..d58d75508ee641f1442896c5e03f46c7cf1e1971 100644 (file)
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1467,10 +1467,13 @@ and :doc:`Virtual Hosting <guides/virtual-instances>` how this can differ.
 -  Boolean
 -  Default: no
 
-.. versionadded:: 4.2.0
-  In versions before 4.2.x, this setting did not exist and supermaster support
+.. versionadded:: 4.1.9
+  In versions before 4.1.9, this setting did not exist and supermaster support
   was enabled by default.
 
+.. versionchanged:: 4.2.0
+  Before 4.2.0, the default was yes.
+
 Turn on supermaster support. See :ref:`supermaster-operation`.
 
 .. _setting-tcp-control-address: