Merge pull request #3346 from rgacogne/dnsdist-reuseport

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

Fri, 26 Feb 2016 20:03:39 +0000 (21:03 +0100)

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

Fri, 26 Feb 2016 20:03:39 +0000 (21:03 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Fri, 26 Feb 2016 20:03:39 +0000 (21:03 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Fri, 26 Feb 2016 20:03:39 +0000 (21:03 +0100)
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Fri, 26 Feb 2016 20:03:39 +0000 (21:03 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Fri, 26 Feb 2016 20:03:39 +0000 (21:03 +0100)
		1	2
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history