Merge pull request #11674 from chbruyand/dnsdist-custom-metrics

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

Fri, 3 Jun 2022 08:22:27 +0000 (10:22 +0200)

committer GitHub <noreply@github.com>

Fri, 3 Jun 2022 08:22:27 +0000 (10:22 +0200)
author Remi Gacogne <remi.gacogne@powerdns.com>
Fri, 3 Jun 2022 08:22:27 +0000 (10:22 +0200)
committer GitHub <noreply@github.com>
Fri, 3 Jun 2022 08:22:27 +0000 (10:22 +0200)
diff --cc pdns/dnsdist-carbon.cc
Simple merge
diff --cc pdns/dnsdist-web.cc
Simple merge
diff --cc regression-tests.dnsdist/test_API.py
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Fri, 3 Jun 2022 08:22:27 +0000 (10:22 +0200)
committer	GitHub <noreply@github.com>
	Fri, 3 Jun 2022 08:22:27 +0000 (10:22 +0200)
		1	2
pdns/dnsdist-carbon.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-web.cc	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.dnsdist/test_API.py	patch \|	diff1 \|	diff2 \|	blob \| history