]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commit898d29cb78e14640cf71539db22031b0eaa53c04
tree1f87a5cbf6ba43a6a96ec9241a60bb2a278cd6f1
parentf1b573c3d4d849f1cbd40ae237d506868af58886
parent425c5358fed9376939cff8a922c3ce1186d6b9e2
Merge PR #28200 into master

* 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>