]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #33922 into octopus
authorSage Weil <sage@redhat.com>
Sat, 14 Mar 2020 15:52:05 +0000 (10:52 -0500)
committerSage Weil <sage@redhat.com>
Sat, 14 Mar 2020 15:52:05 +0000 (10:52 -0500)
commitbbeefb2c10795aa2641c71dae537472bbe61874f
treefe204476aac0e45e36a2e5957a5d3c28e297da1a
parentd11d15ece229612ac41e3eed9bde11419d23fa89
parent279cfb551fe77118069d2c7cc5a5afad023430ea
Merge PR #33922 into octopus

* refs/pull/33922/head:
qa/tasks/mgr/test_orchestrator_cli: adapt
qa/suites/rados/cephadm/upgrade: start from compatible build
mgr/cephadm: refine log message
python-common: correctly dictify DriveGroupSpec objects when paths are used
mgr/cephadm: adapt test_cephadm.sh to new syntax
mgr/cephadm: adapt qa->test_cephadm.sh
qa/tasks/cephadm: use 'orch daemon osd add'
mgr/cephadm: adapt osd deployment to service_apply

Reviewed-by: Sage Weil <sage@redhat.com>
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/orchestrator/_interface.py
src/pybind/mgr/orchestrator/module.py