Merge pull request #11302 from omoerbeek/rec-additional

author Otto Moerbeek <otto.moerbeek@open-xchange.com>

Tue, 22 Feb 2022 18:37:38 +0000 (19:37 +0100)

committer GitHub <noreply@github.com>

Tue, 22 Feb 2022 18:37:38 +0000 (19:37 +0100)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Tue, 22 Feb 2022 18:37:38 +0000 (19:37 +0100)
committer GitHub <noreply@github.com>
Tue, 22 Feb 2022 18:37:38 +0000 (19:37 +0100)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Tue, 22 Feb 2022 18:37:38 +0000 (19:37 +0100)
committer	GitHub <noreply@github.com>
	Tue, 22 Feb 2022 18:37:38 +0000 (19:37 +0100)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history