From: Sage Weil <sage@newdream.net>
Date: Wed, 17 Mar 2021 21:18:39 +0000 (-0500)
Subject: Merge PR #40132 into pacific
X-Git-Tag: v16.2.0~100
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7d15f7f79f9133c725f9c3e7a4352c8de7d84cae;p=ceph.git

Merge PR #40132 into pacific

* refs/pull/40132/head:
	mgr: wait for ~3 beacons on startup if mons are pre-pacific
	mon/MgrMonitor: populate available_modules from promote_standby()

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

7d15f7f79f9133c725f9c3e7a4352c8de7d84cae