]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7a4c8f 41fd2f5)
Merge PR #33694 into master
authorSage Weil <sage@redhat.com>
Tue, 3 Mar 2020 15:07:19 +0000 (09:07 -0600)
committerSage Weil <sage@redhat.com>
Tue, 3 Mar 2020 15:07:19 +0000 (09:07 -0600)
* refs/pull/33694/head:
cephadm: fix `alertmanager not implemented yet`

Reviewed-by: Sage Weil <sage@redhat.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.