Merge pull request #12385 from rgacogne/ddist-ffi-metrics

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

Tue, 10 Jan 2023 14:40:24 +0000 (15:40 +0100)

committer GitHub <noreply@github.com>

Tue, 10 Jan 2023 14:40:24 +0000 (15:40 +0100)
author Remi Gacogne <remi.gacogne@powerdns.com>
Tue, 10 Jan 2023 14:40:24 +0000 (15:40 +0100)
committer GitHub <noreply@github.com>
Tue, 10 Jan 2023 14:40:24 +0000 (15:40 +0100)
diff --cc pdns/dnsdist.hh
Simple merge
diff --cc pdns/dnsdistdist/dnsdist-lua-ffi.cc
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Tue, 10 Jan 2023 14:40:24 +0000 (15:40 +0100)
committer	GitHub <noreply@github.com>
	Tue, 10 Jan 2023 14:40:24 +0000 (15:40 +0100)
		1	2
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/dnsdist-lua-ffi.cc	patch \|	diff1 \|	diff2 \|	blob \| history