From: Sage Weil <sage@redhat.com>
Date: Sat, 18 Jan 2020 20:47:40 +0000 (-0600)
Subject: Merge PR #32640 into master
X-Git-Tag: v15.1.0~179
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b75b04b78b6706abf2e40fbf86a256de2b25669;p=ceph.git

Merge PR #32640 into master

* refs/pull/32640/head:
	cephadm: fix help message for bootstrap --mgr-id

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

2b75b04b78b6706abf2e40fbf86a256de2b25669