From: Sage Weil Date: Fri, 6 Mar 2020 17:30:01 +0000 (-0600) Subject: Merge PR #33772 into master X-Git-Tag: v15.1.1~83 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=234b4ebd41e8c847441004328d13bc78b718ac96;p=ceph-ci.git Merge PR #33772 into master * refs/pull/33772/head: mgr/cephadm: upgrade all ceph daemon types mgr/cephadm: do not specify --image arg for non-ceph daemons; fix upgrade mgr/cephadm: fix error-path return values for _run_cephadm mgr/orch: fix RGWSpec loading mgr/cephadm: fix 'orch rm' Reviewed-by: Joshua Schmid --- 234b4ebd41e8c847441004328d13bc78b718ac96