]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
* refs/pull/33957/head:
Add alertmanager sample

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

Trivial merge