From: Sage Weil <sage@redhat.com>
Date: Tue, 25 Feb 2020 13:44:18 +0000 (-0600)
Subject: Merge PR #33504 into master
X-Git-Tag: v15.1.1~270
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f5d081fa2ae8ba8259b686131670eb7eeb8d6f74;p=ceph.git

Merge PR #33504 into master

* 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>
---

f5d081fa2ae8ba8259b686131670eb7eeb8d6f74