Merge pull request #3556 from rgacogne/dnsdist-tcp-max-queued

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

Fri, 11 Mar 2016 20:57:30 +0000 (21:57 +0100)

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

Fri, 11 Mar 2016 20:57:30 +0000 (21:57 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Fri, 11 Mar 2016 20:57:30 +0000 (21:57 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Fri, 11 Mar 2016 20:57:30 +0000 (21:57 +0100)
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Fri, 11 Mar 2016 20:57:30 +0000 (21:57 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Fri, 11 Mar 2016 20:57:30 +0000 (21:57 +0100)
		1	2
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history