]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #32003 into master
authorSage Weil <sage@redhat.com>
Thu, 12 Dec 2019 23:05:11 +0000 (17:05 -0600)
committerSage Weil <sage@redhat.com>
Thu, 12 Dec 2019 23:05:11 +0000 (17:05 -0600)
commitb640a76e588a6a80c3c71128ba4ba2b1cb050cea
tree50993e3937b2eed2ce5c1c4717c6fcafa3b8b6b0
parent40db88b70f53b1f31a63f55634152174bb01eb4d
parente4a685351c1c44a76dabe71ad1fe39eeeeb2ee35
Merge PR #32003 into master

* refs/pull/32003/head:
mgr/ssh fix tests for update_mds/mgr/mds/rgw/rbd-mirror
Allow List[HostSpec] in PlacementSpec
mgr/rook: adapt to arg passing change in orchestrator_cli.py
mgr/ssh: Add SimpleScheduler and streamline arg passing
orch_cli: adapt to changes in PlacementSpec and ServiceSpec
orch: extend PlacementSpec and add StatefulServiceSpec

Reviewed-by: Sebastian Wagner <swagner@suse.com>
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/orchestrator_cli/module.py