]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #4571 from ceph/wip-11256-firefly
authorYehuda Sadeh <yehuda@redhat.com>
Wed, 6 May 2015 20:07:11 +0000 (13:07 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Wed, 6 May 2015 20:07:11 +0000 (13:07 -0700)
Wip 11256 firefly

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
1  2 
src/rgw/rgw_rados.cc

Simple merge