]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3163af3 d47386c)
Merge PR #29835 into master
authorSage Weil <sage@redhat.com>
Tue, 3 Sep 2019 14:19:21 +0000 (09:19 -0500)
committerSage Weil <sage@redhat.com>
Tue, 3 Sep 2019 14:19:21 +0000 (09:19 -0500)
* refs/pull/29835/head:
osd/PeeringState: fix wrong history of merge target

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/PeeringState.cc patch | diff1 | diff2 | blob | history

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