Merge pull request #9414 from rgacogne/rec-cname-rpz-4

author Remi Gacogne <remi.gacogne@powerdns.com>

Fri, 28 Aug 2020 08:25:44 +0000 (10:25 +0200)

committer GitHub <noreply@github.com>

Fri, 28 Aug 2020 08:25:44 +0000 (10:25 +0200)
author Remi Gacogne <remi.gacogne@powerdns.com>
Fri, 28 Aug 2020 08:25:44 +0000 (10:25 +0200)
committer GitHub <noreply@github.com>
Fri, 28 Aug 2020 08:25:44 +0000 (10:25 +0200)
diff --cc .github/actions/spell-check/expect.txt
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Fri, 28 Aug 2020 08:25:44 +0000 (10:25 +0200)
committer	GitHub <noreply@github.com>
	Fri, 28 Aug 2020 08:25:44 +0000 (10:25 +0200)
		1	2
.github/actions/spell-check/expect.txt	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history