From: Sage Weil Date: Mon, 9 Mar 2020 13:28:57 +0000 (-0500) Subject: Merge PR #33793 into master X-Git-Tag: v15.1.1~59 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5206bfbd48467d551aaf2e0fce29cfcebfa44e33;p=ceph.git 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 --- 5206bfbd48467d551aaf2e0fce29cfcebfa44e33