Merge pull request #6042 from rgacogne/rec-duplicate-ns-ip

author Remi Gacogne <rgacogne@users.noreply.github.com>

Fri, 15 Dec 2017 20:13:45 +0000 (21:13 +0100)

committer GitHub <noreply@github.com>

Fri, 15 Dec 2017 20:13:45 +0000 (21:13 +0100)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Fri, 15 Dec 2017 20:13:45 +0000 (21:13 +0100)
committer GitHub <noreply@github.com>
Fri, 15 Dec 2017 20:13:45 +0000 (21:13 +0100)
diff --cc pdns/recursordist/test-syncres_cc.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Fri, 15 Dec 2017 20:13:45 +0000 (21:13 +0100)
committer	GitHub <noreply@github.com>
	Fri, 15 Dec 2017 20:13:45 +0000 (21:13 +0100)
		1	2
pdns/recursordist/test-syncres_cc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history