]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3a473c 04de9c1)
Merge pull request #8856 from avnerbh/fixes_4_keepalive_to_xio
authorMatt Benjamin <mbenjamin@redhat.com>
Mon, 23 May 2016 21:12:45 +0000 (17:12 -0400)
committerMatt Benjamin <mbenjamin@redhat.com>
Mon, 23 May 2016 21:12:45 +0000 (17:12 -0400)
xio: provide keepalive(s) and their ack(s)

1  2 
src/msg/xio/XioMessenger.cc patch | diff1 | diff2 | blob | history
src/msg/xio/XioMsg.cc patch | diff1 | diff2 | blob | history
src/msg/xio/XioPortal.h patch | diff1 | diff2 | blob | history

diff --cc src/msg/xio/XioMessenger.cc
Simple merge
diff --cc src/msg/xio/XioMsg.cc
Simple merge
diff --cc src/msg/xio/XioPortal.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.