]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'rgw'
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Tue, 22 Mar 2011 10:02:20 +0000 (03:02 -0700)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Tue, 22 Mar 2011 10:02:20 +0000 (03:02 -0700)

Trivial merge