]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6121f7 95bec98)
Merge pull request #40049 from gregsfortytwo/wip-stretch-fixes-2
authorGregory Farnum <gfarnum@redhat.com>
Mon, 15 Mar 2021 18:33:35 +0000 (11:33 -0700)
committerGitHub <noreply@github.com>
Mon, 15 Mar 2021 18:33:35 +0000 (11:33 -0700)
osd: Fix a bunch of stretch peering issues

Reviewed-by: Sam Just <sjust@redhat.com>
1  2 
src/osd/PeeringState.cc patch | diff1 | diff2 | blob | history
src/osd/PeeringState.h patch | diff1 | diff2 | blob | history

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