]> granicus.if.org Git - pdns/commitdiff
Merge pull request #8318 from rgacogne/ddist-prometheus-labels dnsdist-1.4.0-rc3
authorRemi Gacogne <rgacogne@users.noreply.github.com>
Mon, 30 Sep 2019 02:03:55 +0000 (04:03 +0200)
committerGitHub <noreply@github.com>
Mon, 30 Sep 2019 02:03:55 +0000 (04:03 +0200)
dnsdist: Better use of labels in our DoH prometheus export

1  2 
pdns/dnsdist-carbon.cc
pdns/dnsdist-lua.cc
pdns/dnsdist-tcp.cc
pdns/dnsdist.cc
pdns/dnsdist.hh
pdns/dnsdistdist/doh.cc
pdns/dnsdistdist/tcpiohandler.cc
pdns/tcpiohandler.hh

Simple merge
Simple merge
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
Simple merge
Simple merge
Simple merge