]> granicus.if.org Git - pdns/commitdiff
Merge pull request #7323 from rgacogne/dnsdist-check-timeout
authorRemi Gacogne <rgacogne@users.noreply.github.com>
Thu, 10 Jan 2019 13:46:32 +0000 (14:46 +0100)
committerGitHub <noreply@github.com>
Thu, 10 Jan 2019 13:46:32 +0000 (14:46 +0100)
dnsdist: Add an optional 'checkTimeout' parameter to 'newServer()'

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

Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge