Merge pull request #3582 from rgacogne/dnsdist-unify

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

Mon, 21 Mar 2016 06:46:21 +0000 (07:46 +0100)

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

Mon, 21 Mar 2016 06:46:21 +0000 (07:46 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Mon, 21 Mar 2016 06:46:21 +0000 (07:46 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Mon, 21 Mar 2016 06:46:21 +0000 (07:46 +0100)
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Mon, 21 Mar 2016 06:46:21 +0000 (07:46 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Mon, 21 Mar 2016 06:46:21 +0000 (07:46 +0100)
		1	2
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history