]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote branch 'origin/large_objects' into unstable
authorSage Weil <sage@newdream.net>
Mon, 26 Jul 2010 17:24:43 +0000 (10:24 -0700)
committerSage Weil <sage@newdream.net>
Mon, 26 Jul 2010 17:24:43 +0000 (10:24 -0700)

Trivial merge