]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-msgr'
authorSage Weil <sage@inktank.com>
Tue, 4 Sep 2012 19:17:13 +0000 (12:17 -0700)
committerSage Weil <sage@inktank.com>
Tue, 4 Sep 2012 19:17:13 +0000 (12:17 -0700)
Reviewed-by: Greg Farnum <greg@inktank.com>
1  2 
src/msg/Pipe.cc
src/msg/Pipe.h

diff --cc src/msg/Pipe.cc
Simple merge
diff --cc src/msg/Pipe.h
Simple merge