]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-rgw-omap'
authorYehuda Sadeh <yehuda@hq.newdream.net>
Thu, 8 Mar 2012 06:35:40 +0000 (22:35 -0800)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Thu, 8 Mar 2012 06:35:40 +0000 (22:35 -0800)
1  2 
src/librados.cc

diff --cc src/librados.cc
Simple merge