]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #40132 into pacific
authorSage Weil <sage@newdream.net>
Wed, 17 Mar 2021 21:18:39 +0000 (16:18 -0500)
committerSage Weil <sage@newdream.net>
Wed, 17 Mar 2021 21:18:39 +0000 (16:18 -0500)
commit7d15f7f79f9133c725f9c3e7a4352c8de7d84cae
tree50f6eedb876a34bdb08a7799ad7ab51f29e5406c
parent08ab4ae8836f18f5631f6d91fdac3d264a7027ea
parent78edf7264fba138890aa584a2ab253fd51aa1f15
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>