]> 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>
Fri, 18 Jun 2010 19:49:55 +0000 (12:49 -0700)
committerSage Weil <sage@newdream.net>
Fri, 18 Jun 2010 19:49:55 +0000 (12:49 -0700)

Trivial merge