Merge pull request #9651 from omoerbeek/rec-prometheus-names

author Otto Moerbeek <otto.moerbeek@open-xchange.com>

Mon, 9 Nov 2020 11:43:37 +0000 (12:43 +0100)

committer GitHub <noreply@github.com>

Mon, 9 Nov 2020 11:43:37 +0000 (12:43 +0100)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Mon, 9 Nov 2020 11:43:37 +0000 (12:43 +0100)
committer GitHub <noreply@github.com>
Mon, 9 Nov 2020 11:43:37 +0000 (12:43 +0100)
diff --cc pdns/lua-recursor4.cc
Simple merge
diff --cc pdns/rec_channel_rec.cc
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Mon, 9 Nov 2020 11:43:37 +0000 (12:43 +0100)
committer	GitHub <noreply@github.com>
	Mon, 9 Nov 2020 11:43:37 +0000 (12:43 +0100)
		1	2
pdns/lua-recursor4.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/rec_channel_rec.cc	patch \|	diff1 \|	diff2 \|	blob \| history