]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #8491 from rgacogne/ddist-parallel-checks
authorRemi Gacogne <rgacogne@users.noreply.github.com>
Mon, 20 Jan 2020 09:11:25 +0000 (10:11 +0100)
committerGitHub <noreply@github.com>
Mon, 20 Jan 2020 09:11:25 +0000 (10:11 +0100)
dnsdist: Implement parallel health checks

1  2 
pdns/dnsdist-lua.cc
pdns/dnsdist.cc
pdns/dnsdist.hh
pdns/dnsdistdist/Makefile.am

Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
index 145d6b0713aadce6010d41d020f6a4f24309bb69,60ddb145b246c4ee286f1191816a18d7628042c4..a4982f27bd79c7ed39974759074521c60cf0a7c1
@@@ -122,8 -122,9 +122,9 @@@ dnsdist_SOURCES = 
        dnsdist-carbon.cc \
        dnsdist-console.cc dnsdist-console.hh \
        dnsdist-dnscrypt.cc \
 -      dnsdist-dynblocks.hh \
 +      dnsdist-dynblocks.cc dnsdist-dynblocks.hh \
        dnsdist-ecs.cc dnsdist-ecs.hh \
+       dnsdist-healthchecks.cc dnsdist-healthchecks.hh \
        dnsdist-idstate.cc \
        dnsdist-kvs.hh dnsdist-kvs.cc \
        dnsdist-lua.hh dnsdist-lua.cc \