From: Sage Weil <sage@redhat.com>
Date: Mon, 9 Dec 2019 13:17:57 +0000 (-0600)
Subject: Merge PR #31800 into master
X-Git-Tag: v15.1.0~610
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e75ee0f3a77db924eefc4e0a7a6e2c8af52f51b;p=ceph.git

Merge PR #31800 into master

* refs/pull/31800/head:
	doc: Update commands in bootstrap.rst
	Update doc/bootstrap.rst
	Update doc/bootstrap.rst
	Merge branch 'master' into wip-doc-prompts-update
	doc: Update commands in bootstrap.rst

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

4e75ee0f3a77db924eefc4e0a7a6e2c8af52f51b