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

Merge PR #33957 into master

* refs/pull/33957/head:
	Add alertmanager sample

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

f4ae54385ce7611f7416e1e2ac8223242e4c3797