]> 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: 06cecb4 122f406)
Merge pull request #7479 from roidayan/fix_xio_compilation
authorSage Weil <sage@redhat.com>
Wed, 3 Feb 2016 13:48:54 +0000 (08:48 -0500)
committerSage Weil <sage@redhat.com>
Wed, 3 Feb 2016 13:48:54 +0000 (08:48 -0500)
msg/xio: fix compilation

1  2 
src/msg/xio/XioConnection.h patch | diff1 | diff2 | blob | history
src/msg/xio/XioPortal.h patch | diff1 | diff2 | blob | history

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