]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #22341 from b-ranto/wip-branto-mgr-mimic
authorBoris Ranto <branto@redhat.com>
Tue, 19 Jun 2018 08:06:42 +0000 (10:06 +0200)
committerGitHub <noreply@github.com>
Tue, 19 Jun 2018 08:06:42 +0000 (10:06 +0200)
[mimic] Sync up ceph-mgr prometheus related changes

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

Trivial merge