]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'rados' of git://ceph.newdream.net/ceph into rados
authorPatience Warnick <patience@cranium.pelton.net>
Mon, 31 Dec 2007 20:09:08 +0000 (12:09 -0800)
committerPatience Warnick <patience@cranium.pelton.net>
Mon, 31 Dec 2007 20:09:08 +0000 (12:09 -0800)

Trivial merge