Merge pull request #4332 from rgacogne/auth-apply-non-local-bind-query

author Peter van Dijk <peter.van.dijk@powerdns.com>

Mon, 5 Sep 2016 08:23:56 +0000 (10:23 +0200)

committer GitHub <noreply@github.com>

Mon, 5 Sep 2016 08:23:56 +0000 (10:23 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Mon, 5 Sep 2016 08:23:56 +0000 (10:23 +0200)
committer GitHub <noreply@github.com>
Mon, 5 Sep 2016 08:23:56 +0000 (10:23 +0200)
diff --cc pdns/mastercommunicator.cc
Simple merge
diff --cc pdns/resolver.hh
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Mon, 5 Sep 2016 08:23:56 +0000 (10:23 +0200)
committer	GitHub <noreply@github.com>
	Mon, 5 Sep 2016 08:23:56 +0000 (10:23 +0200)
		1	2
pdns/mastercommunicator.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/resolver.hh	patch \|	diff1 \|	diff2 \|	blob \| history