]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32281 into master
authorSage Weil <sage@redhat.com>
Mon, 23 Dec 2019 21:59:20 +0000 (15:59 -0600)
committerSage Weil <sage@redhat.com>
Mon, 23 Dec 2019 21:59:20 +0000 (15:59 -0600)
* refs/pull/32281/head:
mgr/cephadm: fix =[] default arg to _create_daemon
qa/suites/rados/cephadm: enable mgr debugging
cephadm: restart non-ceph daemons on reconfig
mgr/cephadm/test_cephadm: fix expected output
mgr/cephadm: fix remapping of hosts and services
mgr/cephadm: add 'reconfig' service action
cephadm: move mon creation config bits into mgr/cephadm
cephadm: fix bootstrap message 'ssh' -> 'cephadm'
cephadm: add --reconfig option for 'deploy'
mgr/orchestrator: drop 'reload' service[-instance] action

Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
src/cephadm/cephadm
test_cephadm.sh

Simple merge
diff --cc test_cephadm.sh
Simple merge