]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'testing' into rc
authorSage Weil <sage@newdream.net>
Tue, 12 Oct 2010 22:15:05 +0000 (15:15 -0700)
committerSage Weil <sage@newdream.net>
Tue, 12 Oct 2010 22:15:05 +0000 (15:15 -0700)

Trivial merge