Merge pull request #10234 from Habbie/qtype-names-csync

author Peter van Dijk <peter.van.dijk@powerdns.com>

Fri, 9 Apr 2021 11:23:24 +0000 (13:23 +0200)

committer GitHub <noreply@github.com>

Fri, 9 Apr 2021 11:23:24 +0000 (13:23 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Fri, 9 Apr 2021 11:23:24 +0000 (13:23 +0200)
committer GitHub <noreply@github.com>
Fri, 9 Apr 2021 11:23:24 +0000 (13:23 +0200)
diff --cc pdns/qtype.cc
Simple merge
diff --cc pdns/test-dnsrecords_cc.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Fri, 9 Apr 2021 11:23:24 +0000 (13:23 +0200)
committer	GitHub <noreply@github.com>
	Fri, 9 Apr 2021 11:23:24 +0000 (13:23 +0200)
		1	2
pdns/qtype.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/test-dnsrecords_cc.cc	patch \|	diff1 \|	diff2 \|	blob \| history