Merge pull request #5835 from rgacogne/rec-disable-validation-for-infra

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

Wed, 25 Oct 2017 13:41:28 +0000 (15:41 +0200)

committer GitHub <noreply@github.com>

Wed, 25 Oct 2017 13:41:28 +0000 (15:41 +0200)
author bert hubert <bert.hubert@netherlabs.nl>
Wed, 25 Oct 2017 13:41:28 +0000 (15:41 +0200)
committer GitHub <noreply@github.com>
Wed, 25 Oct 2017 13:41:28 +0000 (15:41 +0200)
diff --cc pdns/syncres.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Wed, 25 Oct 2017 13:41:28 +0000 (15:41 +0200)
committer	GitHub <noreply@github.com>
	Wed, 25 Oct 2017 13:41:28 +0000 (15:41 +0200)
		1	2
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history