From: Sage Weil <sage@newdream.net>
Date: Mon, 15 Mar 2021 20:11:24 +0000 (-0400)
Subject: Merge PR #40078 into master
X-Git-Tag: v17.1.0~2609
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c62bd5e05ea72e884b14fd3f2555fbc9d4755b33;p=ceph-ci.git

Merge PR #40078 into master

* refs/pull/40078/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>
---

c62bd5e05ea72e884b14fd3f2555fbc9d4755b33