Merge pull request #9707 from omoerbeek/rec-chain-already-processing

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

Thu, 12 Nov 2020 19:20:14 +0000 (20:20 +0100)

committer GitHub <noreply@github.com>

Thu, 12 Nov 2020 19:20:14 +0000 (20:20 +0100)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Thu, 12 Nov 2020 19:20:14 +0000 (20:20 +0100)
committer GitHub <noreply@github.com>
Thu, 12 Nov 2020 19:20:14 +0000 (20:20 +0100)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Thu, 12 Nov 2020 19:20:14 +0000 (20:20 +0100)
committer	GitHub <noreply@github.com>
	Thu, 12 Nov 2020 19:20:14 +0000 (20:20 +0100)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history