From: Sage Weil <sage@redhat.com>
Date: Wed, 11 Mar 2020 14:41:28 +0000 (-0500)
Subject: Merge PR #33746 into octopus
X-Git-Tag: v15.1.1~36
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ae9578c80b68415c6b1c7117eaf0965734905a97;p=ceph.git

Merge PR #33746 into octopus

* refs/pull/33746/head:
	cephadm: add grafana adopt

Reviewed-by: Sage Weil <sage@redhat.com>
---

ae9578c80b68415c6b1c7117eaf0965734905a97