]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2565 from ceph/wip-rgw-firefly-backports
authorYehuda Sadeh <yehuda@inktank.com>
Thu, 2 Oct 2014 22:28:40 +0000 (15:28 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Thu, 2 Oct 2014 22:28:40 +0000 (15:28 -0700)
Wip rgw firefly backports

1  2 
src/rgw/rgw_main.cc

Simple merge