Merge pull request #5937 from rgacogne/rec-self-resolving-ns

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

Fri, 10 Nov 2017 11:39:42 +0000 (12:39 +0100)

committer GitHub <noreply@github.com>

Fri, 10 Nov 2017 11:39:42 +0000 (12:39 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Fri, 10 Nov 2017 11:39:42 +0000 (12:39 +0100)
committer GitHub <noreply@github.com>
Fri, 10 Nov 2017 11:39:42 +0000 (12:39 +0100)
diff --cc pdns/recursordist/test-syncres_cc.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Fri, 10 Nov 2017 11:39:42 +0000 (12:39 +0100)
committer	GitHub <noreply@github.com>
	Fri, 10 Nov 2017 11:39:42 +0000 (12:39 +0100)
		1	2
pdns/recursordist/test-syncres_cc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history