]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33695 into master
authorSage Weil <sage@redhat.com>
Tue, 3 Mar 2020 20:58:49 +0000 (14:58 -0600)
committerSage Weil <sage@redhat.com>
Tue, 3 Mar 2020 20:58:49 +0000 (14:58 -0600)
* refs/pull/33695/head:
mgr/orch: add apply alertmanager to CLI
mgr/orch: add apply grafana to CLI

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

Trivial merge