]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #40078 into master
authorSage Weil <sage@newdream.net>
Mon, 15 Mar 2021 20:11:24 +0000 (16:11 -0400)
committerSage Weil <sage@newdream.net>
Mon, 15 Mar 2021 20:11:24 +0000 (16:11 -0400)
commitc62bd5e05ea72e884b14fd3f2555fbc9d4755b33
tree0e6626e525a231378e8fd94dde6b5e1d62e86f51
parent52c016aa02a3608a428898a8de03ea347f9d0d5f
parentb356fd0a8c65b4f6dad9e51286df380e6974f842
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>