]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3ffbb8 b6084c3)
Merge PR #33793 into master
authorSage Weil <sage@redhat.com>
Mon, 9 Mar 2020 13:28:57 +0000 (08:28 -0500)
committerSage Weil <sage@redhat.com>
Mon, 9 Mar 2020 13:28:57 +0000 (08:28 -0500)
* refs/pull/33793/head:
qa/suites/rados/cephadm/upgrade: new start point
qa/tasks/cephadm: put bootstrap config etc directly in /etc/ceph
cephadm: shell: default to config and keyring in /etc/ceph, if present

Reviewed-by: Ricardo Marques <rimarques@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.