]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit5206bfbd48467d551aaf2e0fce29cfcebfa44e33
tree5130a42c4353dd5e5f74b9a60e96b0b99c25056btree | snapshot
parentf3ffbb88f6a4662a75e85c5ba89938a6338a1612commit | diff
parentb6084c333df3c2af47ab2da1680ee4f25547caaccommit | diff
Merge PR #33793 into master

* 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>
src/cephadm/cephadm diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.