]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33504 into master
authorSage Weil <sage@redhat.com>
Tue, 25 Feb 2020 13:44:18 +0000 (07:44 -0600)
committerSage Weil <sage@redhat.com>
Tue, 25 Feb 2020 13:44:18 +0000 (07:44 -0600)
* refs/pull/33504/head:
cephadm: allow skipping prepare_host in bootstrap step

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Joshua Schmid <jschmid@suse.de>

Trivial merge