Merge pull request #10649 from rgacogne/lock-guarded-ddist

author Remi Gacogne <remi.gacogne@powerdns.com>

Wed, 18 Aug 2021 09:31:36 +0000 (11:31 +0200)

committer GitHub <noreply@github.com>

Wed, 18 Aug 2021 09:31:36 +0000 (11:31 +0200)
author Remi Gacogne <remi.gacogne@powerdns.com>
Wed, 18 Aug 2021 09:31:36 +0000 (11:31 +0200)
committer GitHub <noreply@github.com>
Wed, 18 Aug 2021 09:31:36 +0000 (11:31 +0200)
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/rec_channel_rec.cc
Simple merge
diff --cc pdns/recursor_cache.cc
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Wed, 18 Aug 2021 09:31:36 +0000 (11:31 +0200)
committer	GitHub <noreply@github.com>
	Wed, 18 Aug 2021 09:31:36 +0000 (11:31 +0200)
		1	2
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/rec_channel_rec.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursor_cache.cc	patch \|	diff1 \|	diff2 \|	blob \| history