Merge pull request #4818 from rgacogne/dnsdist-connect-timeout

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

Fri, 20 Jan 2017 10:14:22 +0000 (11:14 +0100)

committer GitHub <noreply@github.com>

Fri, 20 Jan 2017 10:14:22 +0000 (11:14 +0100)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Fri, 20 Jan 2017 10:14:22 +0000 (11:14 +0100)
committer GitHub <noreply@github.com>
Fri, 20 Jan 2017 10:14:22 +0000 (11:14 +0100)
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/dnsdist-console.cc
Simple merge
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Fri, 20 Jan 2017 10:14:22 +0000 (11:14 +0100)
committer	GitHub <noreply@github.com>
	Fri, 20 Jan 2017 10:14:22 +0000 (11:14 +0100)
		1	2
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-console.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history