Merge pull request #3405 from rgacogne/dnsdist-health-check-failures

author bert hubert <bert.hubert@netherlabs.nl>

Thu, 18 Feb 2016 20:19:35 +0000 (21:19 +0100)

committer bert hubert <bert.hubert@netherlabs.nl>

Thu, 18 Feb 2016 20:19:35 +0000 (21:19 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Thu, 18 Feb 2016 20:19:35 +0000 (21:19 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Thu, 18 Feb 2016 20:19:35 +0000 (21:19 +0100)
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Thu, 18 Feb 2016 20:19:35 +0000 (21:19 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Thu, 18 Feb 2016 20:19:35 +0000 (21:19 +0100)
		1	2
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history