From: Sage Weil <sage@redhat.com>
Date: Mon, 3 Jun 2019 20:43:33 +0000 (-0500)
Subject: Merge PR #28200 into master
X-Git-Tag: v15.1.0~2579
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=898d29cb78e14640cf71539db22031b0eaa53c04;p=ceph.git

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

898d29cb78e14640cf71539db22031b0eaa53c04