From: Otto <otto.moerbeek@open-xchange.com>
Date: Tue, 8 Jun 2021 08:00:22 +0000 (+0200)
Subject: Merge branch 'rec-prep-4.4.4' into rec-prep-4.5.2
X-Git-Tag: dnsdist-1.7.0-alpha1~151^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10481%2Fhead;p=thirdparty%2Fpdns.git

Merge branch 'rec-prep-4.4.4' into rec-prep-4.5.2
---

9fb55dcbe2a3099d04e7a4bd0230cbf87f16673a
diff --cc docs/secpoll.zone
index c846dbacc3,6bc98b60c4..1dfb33ee7c
--- a/docs/secpoll.zone
+++ b/docs/secpoll.zone
@@@ -261,6 -262,6 +262,7 @@@ recursor-4.5.0-beta2.security-statu
  recursor-4.5.0-rc1.security-status                      60 IN TXT "3 Unsupported pre-release"
  recursor-4.5.0.security-status                          60 IN TXT "2 Unsupported pre-release"
  recursor-4.5.1.security-status                          60 IN TXT "1 OK"
++recursor-4.5.2.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/"