]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #34001 into octopus
authorSage Weil <sage@redhat.com>
Wed, 18 Mar 2020 22:42:10 +0000 (17:42 -0500)
committerSage Weil <sage@redhat.com>
Wed, 18 Mar 2020 22:42:10 +0000 (17:42 -0500)
* refs/pull/34001/head:
mgr/cephadm: pytest: Enable SpecStore
mgr/orchestrator: add test for default implementation for apply()
python-common: validate ServiceSpec.service_type
fixup mgr/cephadm: Fix ceph orch apply -i
mgr/dashbaord: orchestrator service: Revert wait_api_result to a single completion
mgr/orchestrator: `orch daemon add` accepts a yaml
mgr/cephadm: apply_drivegroups() returns a single Completion
mgr/cephadm: remove `trivial_result()`
mgr/cephadm: Fix `ceph orch apply -i`

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/pybind/mgr/cephadm/module.py
src/python-common/ceph/deployment/service_spec.py

Simple merge