]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #33012 into master
authorSage Weil <sage@redhat.com>
Mon, 3 Feb 2020 22:27:51 +0000 (16:27 -0600)
committerSage Weil <sage@redhat.com>
Mon, 3 Feb 2020 22:27:51 +0000 (16:27 -0600)
commit0f61bbcdcbf520913bc727656e5deb9e7a0ce54a
treebc73794c11646f7dce71c66bdbbec297884a8d44
parentc5af4b35053f56b0e9b299bf18e5a9b658cda2b2
parent1ad536ba40f86421d11d55d7b2413382bec0632d
Merge PR #33012 into master

* refs/pull/33012/head:
mgr/cephadm: prefix daemon ids with hostname
cephadm: bootstrap: name mgr with $hostname.$random

Reviewed-by: Sebastian Wagner <swagner@suse.com>
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/tests/test_cephadm.py