]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-2289-2'
authorYehuda Sadeh <yehuda@hq.newdream.net>
Tue, 17 Apr 2012 20:22:31 +0000 (13:22 -0700)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Tue, 17 Apr 2012 20:22:31 +0000 (13:22 -0700)
1  2 
src/osdc/Objecter.cc
src/rgw/rgw_rados.cc

Simple merge
Simple merge