]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #31800 into master
authorSage Weil <sage@redhat.com>
Mon, 9 Dec 2019 13:17:57 +0000 (07:17 -0600)
committerSage Weil <sage@redhat.com>
Mon, 9 Dec 2019 13:17:57 +0000 (07:17 -0600)
* 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>

Trivial merge