Merge pull request #11283 from omoerbeek/rec-hints

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

Fri, 4 Feb 2022 09:21:27 +0000 (10:21 +0100)

committer GitHub <noreply@github.com>

Fri, 4 Feb 2022 09:21:27 +0000 (10:21 +0100)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Fri, 4 Feb 2022 09:21:27 +0000 (10:21 +0100)
committer GitHub <noreply@github.com>
Fri, 4 Feb 2022 09:21:27 +0000 (10:21 +0100)
diff --cc pdns/recursordist/rec-main.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Fri, 4 Feb 2022 09:21:27 +0000 (10:21 +0100)
committer	GitHub <noreply@github.com>
	Fri, 4 Feb 2022 09:21:27 +0000 (10:21 +0100)
		1	2
pdns/recursordist/rec-main.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history