]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e0415f 29c5cce)
Merge PR #33073 into master
authorSage Weil <sage@redhat.com>
Fri, 14 Feb 2020 18:52:26 +0000 (12:52 -0600)
committerSage Weil <sage@redhat.com>
Fri, 14 Feb 2020 18:52:26 +0000 (12:52 -0600)
* refs/pull/33073/head:
qa/suites/rados/cephadm: deploy prometheus.a
mgr/cephadm: implement prometheus add/update
mgr/cephadm: teach _create_daemon how to provision prometheus
mgr/orch: add prom hooks

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.