]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commitd8ec125bda5b0eee346ff6fd874e8f0134c679ba
treeee03890dc24fded5209008e9aa48b0c1118f23c7
parent573da4ecabd90c5b9d216bbf1b3ef7416b8fde76
parent354d9d2d58b3991c73eb0fb9b58fcfaf9436afba
Merge PR #33958 into master

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

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