]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #22366 from b-ranto/wip-branto-mgr-luminous
authorYuri Weinstein <yweinste@redhat.com>
Fri, 22 Jun 2018 16:22:16 +0000 (09:22 -0700)
committerGitHub <noreply@github.com>
Fri, 22 Jun 2018 16:22:16 +0000 (09:22 -0700)
luminous: Sync up ceph-mgr prometheus module

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

Trivial merge