]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9a93ad fc101d8)
Merge PR #33980 into octopus
authorSage Weil <sage@redhat.com>
Mon, 16 Mar 2020 12:44:59 +0000 (07:44 -0500)
committerSage Weil <sage@redhat.com>
Mon, 16 Mar 2020 12:44:59 +0000 (07:44 -0500)
* refs/pull/33980/head:
cephadm: bootstrap: allow --output-dir
cephadm: do not infer image for bootstrap
cephadm: write output files to /etc/ceph by default
cephadm: verify the output files' containing directory exists

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.