From: Sage Weil <sage@redhat.com>
Date: Tue, 24 Mar 2020 21:41:09 +0000 (-0500)
Subject: Merge PR #33958 into master
X-Git-Tag: v16.1.0~2814
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d8ec125bda5b0eee346ff6fd874e8f0134c679ba;p=ceph.git

Merge PR #33958 into master

* refs/pull/33958/head:
	Add alertmanager adopt

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

d8ec125bda5b0eee346ff6fd874e8f0134c679ba