]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3244d8 88b54ee)
Merge PR #34157 into octopus
authorSage Weil <sage@redhat.com>
Thu, 26 Mar 2020 01:26:27 +0000 (20:26 -0500)
committerSage Weil <sage@redhat.com>
Thu, 26 Mar 2020 01:26:27 +0000 (20:26 -0500)
* refs/pull/34157/head:
Add alertmanager adopt

Reviewed-by: Michael Fritch <mfritch@suse.com>
1  2 
src/cephadm/cephadm patch | diff1 | diff2 | blob | history

diff --cc src/cephadm/cephadm
Simple merge
Unnamed repository; edit this file 'description' to name the repository.