From: Sage Weil <sage@redhat.com>
Date: Mon, 24 Feb 2020 19:42:08 +0000 (-0600)
Subject: Merge PR #33418 into master
X-Git-Tag: v15.1.1~286
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=971cf07c1477133dd6817e08c61fd93484209f9c;p=ceph.git

Merge PR #33418 into master

* refs/pull/33418/head:
	mon: stash newer map on bootstrap when addr doesn't match

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

971cf07c1477133dd6817e08c61fd93484209f9c