From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 20 Apr 2018 17:01:22 +0000 (-0700)
Subject: Merge pull request #21492 from b-ranto/wip-mgr-rgw-luminous
X-Git-Tag: v12.2.5~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce21d1104608efdcc6cc7719ff52ca0153a9954b;p=ceph.git

Merge pull request #21492 from b-ranto/wip-mgr-rgw-luminous

[luminous] Backport recent prometheus rgw changes

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
---

ce21d1104608efdcc6cc7719ff52ca0153a9954b