]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #33772 into master
authorSage Weil <sage@redhat.com>
Fri, 6 Mar 2020 17:30:01 +0000 (11:30 -0600)
committerSage Weil <sage@redhat.com>
Fri, 6 Mar 2020 17:30:01 +0000 (11:30 -0600)
commit234b4ebd41e8c847441004328d13bc78b718ac96
tree9ac4d23d9634ec017fd379b6bb618f7fb756f29f
parent97c54ff9c5baa4b12285cde94077f487a6f4a544
parentdfecbb19f5e71762791ee275499bd2c9173a7ecf
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 <jschmid@suse.de>
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/orchestrator/_interface.py