]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #20642 from b-ranto/wip-mgr-prom-luminous
authorYuri Weinstein <yweinste@redhat.com>
Fri, 6 Apr 2018 15:59:07 +0000 (08:59 -0700)
committerGitHub <noreply@github.com>
Fri, 6 Apr 2018 15:59:07 +0000 (08:59 -0700)
[luminous] Backport recent prometheus exporter changes

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

Trivial merge