Merge pull request #7171 from rgacogne/rec-ban-more-types

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

Mon, 12 Nov 2018 08:31:15 +0000 (09:31 +0100)

committer GitHub <noreply@github.com>

Mon, 12 Nov 2018 08:31:15 +0000 (09:31 +0100)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Mon, 12 Nov 2018 08:31:15 +0000 (09:31 +0100)
committer GitHub <noreply@github.com>
Mon, 12 Nov 2018 08:31:15 +0000 (09:31 +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>
	Mon, 12 Nov 2018 08:31:15 +0000 (09:31 +0100)
committer	GitHub <noreply@github.com>
	Mon, 12 Nov 2018 08:31:15 +0000 (09:31 +0100)
		1	2
pdns/recursordist/test-syncres_cc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history