Merge pull request #11707 from rgacogne/ddist-latencies

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

Wed, 22 Jun 2022 11:58:57 +0000 (13:58 +0200)

committer GitHub <noreply@github.com>

Wed, 22 Jun 2022 11:58:57 +0000 (13:58 +0200)
author Remi Gacogne <remi.gacogne@powerdns.com>
Wed, 22 Jun 2022 11:58:57 +0000 (13:58 +0200)
committer GitHub <noreply@github.com>
Wed, 22 Jun 2022 11:58:57 +0000 (13:58 +0200)
diff --cc pdns/dnsdist-web.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Wed, 22 Jun 2022 11:58:57 +0000 (13:58 +0200)
committer	GitHub <noreply@github.com>
	Wed, 22 Jun 2022 11:58:57 +0000 (13:58 +0200)
		1	2
pdns/dnsdist-web.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history