From: Sage Weil <sage@redhat.com>
Date: Sat, 12 Jan 2019 11:44:00 +0000 (-0600)
Subject: Merge PR #25886 into master
X-Git-Tag: v14.1.0~420
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a32d5ba1f7248a5196a89fa29a7b3044dd4d785;p=ceph.git

Merge PR #25886 into master

* refs/pull/25886/head:
	qa/tasks/rebuild_mondb: use monmap to properly name the mons
	ceph-monstore-tool: add --monmap <path> argument to rebuild command
	ceph-mon: dump monmap to debug logs
	Revert "mon/MonMap: no noname- mon name prefix when for_mkfs"
	mon/MonMap: improve/fix initial monmap generation for mkfs
	ceph-mon: make membership check with public_addr more robust
	ceph-mon: make mkfs check whether I am in monmap more robust

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

9a32d5ba1f7248a5196a89fa29a7b3044dd4d785