]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #33957 into master
authorSage Weil <sage@redhat.com>
Tue, 24 Mar 2020 21:42:09 +0000 (16:42 -0500)
committerSage Weil <sage@redhat.com>
Tue, 24 Mar 2020 21:42:09 +0000 (16:42 -0500)
commitf4ae54385ce7611f7416e1e2ac8223242e4c3797
tree2073dcac08890369488354febafa888ee9c86478
parentd8ec125bda5b0eee346ff6fd874e8f0134c679ba
parent5cbe0c4f8fc9b7ca24a140643237e13df6851463
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>