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

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