]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2906da6 43e28a0)
Merge PR #33825 into octopus
authorSage Weil <sage@redhat.com>
Tue, 10 Mar 2020 03:42:05 +0000 (22:42 -0500)
committerSage Weil <sage@redhat.com>
Tue, 10 Mar 2020 03:42:05 +0000 (22:42 -0500)
* refs/pull/33825/head:
cephadm: bootstrap: tolerate error return from -h
ceph.in: only shut down rados on clean exit

Reviewed-by: Kefu Chai <kchai@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.