]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #31537 into master
authorSage Weil <sage@redhat.com>
Tue, 12 Nov 2019 16:23:06 +0000 (10:23 -0600)
committerSage Weil <sage@redhat.com>
Tue, 12 Nov 2019 16:23:06 +0000 (10:23 -0600)
* refs/pull/31537/head:
mgr/orchestrator: move split_host into shared helpers
mgr/ssh: allow names to be specified for stateless services
mgr/ssh: optionally specify names for mon daemons
mgr/ssh: optionally specify names for mgr daemons

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

Simple merge
Simple merge