Merge pull request #5569 from rgacogne/rec-dnskey-loop

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

Thu, 10 Aug 2017 09:17:56 +0000 (11:17 +0200)

committer GitHub <noreply@github.com>

Thu, 10 Aug 2017 09:17:56 +0000 (11:17 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Thu, 10 Aug 2017 09:17:56 +0000 (11:17 +0200)
committer GitHub <noreply@github.com>
Thu, 10 Aug 2017 09:17:56 +0000 (11:17 +0200)
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>
	Thu, 10 Aug 2017 09:17:56 +0000 (11:17 +0200)
committer	GitHub <noreply@github.com>
	Thu, 10 Aug 2017 09:17:56 +0000 (11:17 +0200)
		1	2
pdns/recursordist/test-syncres_cc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history