]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08ab4ae 78edf72)
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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.