Merge pull request #3412 from pieterlexis/dnsdist-check-config

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

Sun, 21 Feb 2016 10:27:56 +0000 (11:27 +0100)

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

Sun, 21 Feb 2016 10:27:56 +0000 (11:27 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Sun, 21 Feb 2016 10:27:56 +0000 (11:27 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Sun, 21 Feb 2016 10:27:56 +0000 (11:27 +0100)
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc regression-tests.dnsdist/runtests
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Sun, 21 Feb 2016 10:27:56 +0000 (11:27 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Sun, 21 Feb 2016 10:27:56 +0000 (11:27 +0100)
		1	2
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.dnsdist/runtests	patch \|	diff1 \|	diff2 \|	blob \| history