Merge pull request #11163 from rgacogne/ddist-random-ports

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

Tue, 22 Feb 2022 08:25:01 +0000 (09:25 +0100)

committer GitHub <noreply@github.com>

Tue, 22 Feb 2022 08:25:01 +0000 (09:25 +0100)
author Remi Gacogne <remi.gacogne@powerdns.com>
Tue, 22 Feb 2022 08:25:01 +0000 (09:25 +0100)
committer GitHub <noreply@github.com>
Tue, 22 Feb 2022 08:25:01 +0000 (09:25 +0100)
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Tue, 22 Feb 2022 08:25:01 +0000 (09:25 +0100)
committer	GitHub <noreply@github.com>
	Tue, 22 Feb 2022 08:25:01 +0000 (09:25 +0100)
		1	2
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history