]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #33175 into master
authorSage Weil <sage@redhat.com>
Tue, 11 Feb 2020 16:42:58 +0000 (10:42 -0600)
committerSage Weil <sage@redhat.com>
Tue, 11 Feb 2020 16:42:58 +0000 (10:42 -0600)
commit02aeeb0dacf6fe611b2b687ba2f74ef9c737ab6e
tree24aa246f633c95969b73bc14763a27dd8a9737a8
parent6dcb514a57e7e18e97ee6511b96f1e9ea3600740
parent453f70bbab50b2feaf7ee4e739e20cc454b0611b
Merge PR #33175 into master

* refs/pull/33175/head:
mgr/cephadm: Add some more type annotations
mgr/orchestrator: unify StatelessServiceSpec and StatefulServiceSpec

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