Merge pull request #3504 from rgacogne/dnsdist-api-key

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

Fri, 4 Mar 2016 07:43:34 +0000 (08:43 +0100)

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

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