]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'stable'
authorSage Weil <sage@newdream.net>
Tue, 19 Jul 2011 18:26:25 +0000 (11:26 -0700)
committerSage Weil <sage@newdream.net>
Tue, 19 Jul 2011 18:26:25 +0000 (11:26 -0700)
1  2 
src/rgw/rgw_admin.cc

Simple merge