Merge pull request #9998 from rgacogne/dnsdist-aligned-atomics

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

Tue, 26 Jan 2021 13:41:04 +0000 (14:41 +0100)

committer GitHub <noreply@github.com>

Tue, 26 Jan 2021 13:41:04 +0000 (14:41 +0100)
author Remi Gacogne <remi.gacogne@powerdns.com>
Tue, 26 Jan 2021 13:41:04 +0000 (14:41 +0100)
committer GitHub <noreply@github.com>
Tue, 26 Jan 2021 13:41:04 +0000 (14:41 +0100)
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Tue, 26 Jan 2021 13:41:04 +0000 (14:41 +0100)
committer	GitHub <noreply@github.com>
	Tue, 26 Jan 2021 13:41:04 +0000 (14:41 +0100)
		1	2
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history