]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-rgw-next-2' into next
authorGreg Farnum <greg@inktank.com>
Fri, 19 Jul 2013 20:25:48 +0000 (13:25 -0700)
committerGreg Farnum <greg@inktank.com>
Fri, 19 Jul 2013 20:25:48 +0000 (13:25 -0700)
Reviewed-by: Greg Farnum <greg@inktank.com>
1  2 
src/rgw/rgw_admin.cc

Simple merge