]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #28200 into master
authorSage Weil <sage@redhat.com>
Mon, 3 Jun 2019 20:43:33 +0000 (15:43 -0500)
committerSage Weil <sage@redhat.com>
Mon, 3 Jun 2019 20:43:33 +0000 (15:43 -0500)
* refs/pull/28200/head:
pybind/mgr: add slash to prometheus illegal metric name characters
pybind/mgr: fix format for rbd-mirror prometheus metrics

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Trivial merge