From: aerique <erik.winkels@powerdns.com>
Date: Thu, 23 May 2019 13:21:52 +0000 (+0200)
Subject: Merge pull request #7842 from aerique/feature/changelog-and-secpoll-for-rec-4.2.0-rc1
X-Git-Tag: dnsdist-1.4.0-beta1~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d6d8ee571cf559852bf2f5be1baae11deaa010a;p=thirdparty%2Fpdns.git

Merge pull request #7842 from aerique/feature/changelog-and-secpoll-for-rec-4.2.0-rc1

Update changelog and secpoll for rec-4.2.0-rc1 release.
---

diff --git a/docs/secpoll.zone b/docs/secpoll.zone
index 18ca1b9348..5a6b7ec231 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. 2019052101 10800 3600 604800 10800
+@       86400   IN  SOA pdns-public-ns1.powerdns.com. pieter\.lexis.powerdns.com. 2019052301 10800 3600 604800 10800
 @       3600    IN  NS  pdns-public-ns1.powerdns.com.
 @       3600    IN  NS  pdns-public-ns2.powerdns.com.
 ; Auth
@@ -184,6 +184,7 @@ recursor-4.1.12.security-status                         60 IN TXT "1 OK"
 recursor-4.1.13.security-status                         60 IN TXT "1 OK"
 recursor-4.2.0-alpha1.security-status                   60 IN TXT "1 OK"
 recursor-4.2.0-beta1.security-status                    60 IN TXT "1 OK"
+recursor-4.2.0-rc1.security-status                      60 IN TXT "1 OK"
 
 ; 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.2.rst b/pdns/recursordist/docs/changelog/4.2.rst
index fb85f956a2..9fbeb8bdb0 100644
--- a/pdns/recursordist/docs/changelog/4.2.rst
+++ b/pdns/recursordist/docs/changelog/4.2.rst
@@ -1,6 +1,29 @@
 Changelogs for 4.2.x
 ====================
 
+.. changelog::
+  :version: 4.2.0-rc1
+  :released: 23th of May 2019
+
+  .. change::
+    :tags: Bug Fixes, SNMP
+    :pullreq: 7826
+
+    Fix the detection of ``snmp_select_info2()``.
+
+  .. change::
+    :tags: Bug Fixes, Internals
+    :pullreq: 7813
+    :tickets: 7272
+
+    Ensure a valid range to ``string()`` in ``PacketReader::getUnquotedText()``
+
+  .. change::
+    :tags: Improvements, SNMP
+    :pullreq: 7818
+
+    Use ``net-snmp-config --netsnmp-agent-libs`` instead of ``--agent-libs``.
+
 .. changelog::
   :version: 4.2.0-beta1
   :released: 7th of May 2019