From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 28 Jun 2021 19:28:56 +0000 (-0700)
Subject: Merge pull request #41621 from cfsnyder/wip-50796-octopus
X-Git-Tag: v15.2.14~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=35def79202a945f2198959c50c4ebfa51e17c7e7;p=ceph.git

Merge pull request #41621 from cfsnyder/wip-50796-octopus

octopus: mon: load stashed map before mkfs monmap

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

35def79202a945f2198959c50c4ebfa51e17c7e7