]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2562 from ceph/wip-5595
authorJosh Durgin <jdurgin@redhat.com>
Tue, 11 Nov 2014 17:18:43 +0000 (18:18 +0100)
committerJosh Durgin <jdurgin@redhat.com>
Tue, 11 Nov 2014 17:18:43 +0000 (18:18 +0100)
Wip 5595

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/rgw/rgw_op.cc
src/rgw/rgw_rados.cc

Simple merge
Simple merge