]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #25886 into master
authorSage Weil <sage@redhat.com>
Sat, 12 Jan 2019 11:44:00 +0000 (05:44 -0600)
committerSage Weil <sage@redhat.com>
Sat, 12 Jan 2019 11:44:00 +0000 (05:44 -0600)
commit9a32d5ba1f7248a5196a89fa29a7b3044dd4d785
tree93be8c6b40ba8cbcd7a9aa62feef5b63bb99bfcc
parented56c86b1c49028ab05a1dc56bab9e3364a93e5f
parentc18a5d2e1cfd2912e6b5c32b12f25cf028d9ef4e
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>