From: Boris Ranto <branto@redhat.com>
Date: Tue, 19 Jun 2018 08:06:42 +0000 (+0200)
Subject: Merge pull request #22341 from b-ranto/wip-branto-mgr-mimic
X-Git-Tag: v13.2.1~127
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2dbf090c1db9bc778d17fdfddd5d18ff9976b25a;p=ceph.git

Merge pull request #22341 from b-ranto/wip-branto-mgr-mimic

[mimic] Sync up ceph-mgr prometheus related changes

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
---

2dbf090c1db9bc778d17fdfddd5d18ff9976b25a