]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33374 into master
authorSage Weil <sage@redhat.com>
Wed, 19 Feb 2020 22:35:10 +0000 (16:35 -0600)
committerSage Weil <sage@redhat.com>
Wed, 19 Feb 2020 22:35:10 +0000 (16:35 -0600)
* refs/pull/33374/head:
cephadm: remove distutils dependency
mgr/cephadm: add prepare-host command
cephadm: prepare-host during bootstrap
cephadm: add prepare-host command
cephadm: include docker.io in image name

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

Simple merge