]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #21492 from b-ranto/wip-mgr-rgw-luminous
authorYuri Weinstein <yweinste@redhat.com>
Fri, 20 Apr 2018 17:01:22 +0000 (10:01 -0700)
committerGitHub <noreply@github.com>
Fri, 20 Apr 2018 17:01:22 +0000 (10:01 -0700)
[luminous] Backport recent prometheus rgw changes

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

Trivial merge