]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33958 into master
authorSage Weil <sage@redhat.com>
Tue, 24 Mar 2020 21:41:09 +0000 (16:41 -0500)
committerSage Weil <sage@redhat.com>
Tue, 24 Mar 2020 21:41:09 +0000 (16:41 -0500)
* refs/pull/33958/head:
Add alertmanager adopt

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

Trivial merge