]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'msgr_zerocopy_read' into unstable
authorSage Weil <sage@newdream.net>
Mon, 15 Nov 2010 04:48:43 +0000 (20:48 -0800)
committerSage Weil <sage@newdream.net>
Mon, 15 Nov 2010 04:48:43 +0000 (20:48 -0800)
1  2 
src/osdc/Objecter.cc

Simple merge