]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1652 from ceph/wip-5170-firefly
authorSage Weil <sage@inktank.com>
Mon, 28 Apr 2014 21:13:24 +0000 (14:13 -0700)
committerSage Weil <sage@inktank.com>
Mon, 28 Apr 2014 21:13:24 +0000 (14:13 -0700)
Wip 5170 firefly

1  2 
src/rgw/rgw_admin.cc

Simple merge