]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commitf3d26fa9058d58a7f00cd2eb3394de81da8dcc9b
tree139469ffe72ed4d94f92588954561a0612651ad1
parentf6bd8d79086d23ce718ea604d1015e84cc9dc108
parent50d247f5a2442cc9b99a4d49873c08baa2438285
Merge PR #32281 into master

* 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>
src/cephadm/cephadm
test_cephadm.sh