Merge pull request #4726 from rgacogne/dnsdist-servfail-no-server

author Remi Gacogne <rgacogne@users.noreply.github.com>

Thu, 8 Dec 2016 09:09:04 +0000 (10:09 +0100)

committer GitHub <noreply@github.com>

Thu, 8 Dec 2016 09:09:04 +0000 (10:09 +0100)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Thu, 8 Dec 2016 09:09:04 +0000 (10:09 +0100)
committer GitHub <noreply@github.com>
Thu, 8 Dec 2016 09:09:04 +0000 (10:09 +0100)
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/dnsdist-lua2.cc
Simple merge
diff --cc pdns/dnsdist-tcp.cc
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Thu, 8 Dec 2016 09:09:04 +0000 (10:09 +0100)
committer	GitHub <noreply@github.com>
	Thu, 8 Dec 2016 09:09:04 +0000 (10:09 +0100)
		1	2
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua2.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-tcp.cc	patch \|	diff1 \|	diff2 \|	blob \| history