From: Sage Weil <sage@redhat.com>
Date: Tue, 3 Mar 2020 20:58:49 +0000 (-0600)
Subject: Merge PR #33695 into master
X-Git-Tag: v15.1.1~146
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cbbc3bc73c9d712fa0d5c15e973c92b5003cfd4d;p=ceph.git

Merge PR #33695 into master

* 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>
---

cbbc3bc73c9d712fa0d5c15e973c92b5003cfd4d