]> 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: 82c4bce 991354f)
Merge PR #33037 into master
authorSage Weil <sage@redhat.com>
Sat, 8 Feb 2020 14:08:01 +0000 (08:08 -0600)
committerSage Weil <sage@redhat.com>
Sat, 8 Feb 2020 14:08:01 +0000 (08:08 -0600)
* refs/pull/33037/head:
osd/OSD: choose more heartbeat peers from different subtrees

Reviewed-by: yanjun <yan.jun8@zte.com.cn>
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history

diff --cc src/osd/OSD.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.