]> granicus.if.org Git - pdns/commitdiff
Merge pull request #6986 from rgacogne/dnsdist-warning-dynblocks
authorRemi Gacogne <rgacogne@users.noreply.github.com>
Wed, 17 Oct 2018 09:20:18 +0000 (11:20 +0200)
committerGitHub <noreply@github.com>
Wed, 17 Oct 2018 09:20:18 +0000 (11:20 +0200)
dnsdist: Add warning rates to dynBlockRulesGroup rules

1  2 
pdns/dnsdist-lua.cc
pdns/dnsdist-web.cc
pdns/dnsdist.hh
pdns/dnsdistdist/Makefile.am
pdns/dnsdistdist/docs/reference/config.rst

Simple merge
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
index 526b725e1ced2fcf3481cc5e52825a1a77528df0,900ddaea6e5dfb97dcaff159b92cd563e4627e3a..bf71a899bd30ccc606487eeff18073c00a52dfd1
@@@ -216,9 -215,9 +216,10 @@@ testrunner_SOURCES = 
        base64.hh \
        dns.hh \
        test-base64_cc.cc \
 +      test-delaypipe_hh.cc \
        test-dnscrypt_cc.cc \
        test-dnsdist_cc.cc \
+       test-dnsdistdynblocks_hh.cc \
        test-dnsdistpacketcache_cc.cc \
        test-dnsdistrings_cc.cc \
        test-dnsdistrules_cc.cc \