]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #32149 into master
authorSage Weil <sage@redhat.com>
Tue, 17 Dec 2019 20:21:48 +0000 (14:21 -0600)
committerSage Weil <sage@redhat.com>
Tue, 17 Dec 2019 20:21:48 +0000 (14:21 -0600)
commita60062a24f91ed1e9e61cbe5eff3257f631fbaef
treea95d7d3e8a8d672e0d651b0d045ddfaed57a5596
parentc8478cf24f63f51dc6b6e76c9d08a602ba8423e8
parent70bae966aa48b932f019c1f081d66c47858faaee
Merge PR #32149 into master

* refs/pull/32149/head:
mgr/orchestrator: Rename PlacementSpec.nodes -> PlacementSpec.hosts
mgr/ansible: Added missing type annotations
mgr/orchestrator: Add __str__ to HostSpec
mgr/ansible: Integrate mgr/ansible/tox into mgr/tox

Reviewed-by: Kefu Chai <kchai@redhat.com>
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/orchestrator_cli/module.py