]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11f9868 fd520a1)
Merge PR #26767 into master
authorSage Weil <sage@redhat.com>
Tue, 5 Mar 2019 17:08:03 +0000 (11:08 -0600)
committerSage Weil <sage@redhat.com>
Tue, 5 Mar 2019 17:08:03 +0000 (11:08 -0600)
* refs/pull/26767/head:
Revert "msg/async/Protocol*: send keep alive if existing wins"

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

diff --cc src/msg/async/ProtocolV2.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.