Merge pull request #9351 from omoerbeek/rec-forwarder-vs-ns-in-cache

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

Tue, 11 Aug 2020 09:03:07 +0000 (11:03 +0200)

committer GitHub <noreply@github.com>

Tue, 11 Aug 2020 09:03:07 +0000 (11:03 +0200)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Tue, 11 Aug 2020 09:03:07 +0000 (11:03 +0200)
committer GitHub <noreply@github.com>
Tue, 11 Aug 2020 09:03:07 +0000 (11:03 +0200)
diff --cc pdns/syncres.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Tue, 11 Aug 2020 09:03:07 +0000 (11:03 +0200)
committer	GitHub <noreply@github.com>
	Tue, 11 Aug 2020 09:03:07 +0000 (11:03 +0200)
		1	2
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history