]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'unstable' of ceph.newdream.net:git/ceph into unstable
authorSage Weil <sage@newdream.net>
Wed, 12 May 2010 23:13:36 +0000 (16:13 -0700)
committerSage Weil <sage@newdream.net>
Wed, 12 May 2010 23:13:36 +0000 (16:13 -0700)

Trivial merge