Merge pull request #10292 from omoerbeek/rec-more-tsan

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

Thu, 6 May 2021 18:17:24 +0000 (20:17 +0200)

committer GitHub <noreply@github.com>

Thu, 6 May 2021 18:17:24 +0000 (20:17 +0200)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Thu, 6 May 2021 18:17:24 +0000 (20:17 +0200)
committer GitHub <noreply@github.com>
Thu, 6 May 2021 18:17:24 +0000 (20:17 +0200)
diff --cc .not-formatted
Simple merge
diff --cc pdns/Makefile.am
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Thu, 6 May 2021 18:17:24 +0000 (20:17 +0200)
committer	GitHub <noreply@github.com>
	Thu, 6 May 2021 18:17:24 +0000 (20:17 +0200)
		1	2
.not-formatted	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history