]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'rados' of ssh://patience@ceph.newdream.net/home/sage/ceph.newdream...
authorPatience Warnick <patience@cranium.pelton.net>
Tue, 15 Jan 2008 20:17:20 +0000 (12:17 -0800)
committerPatience Warnick <patience@cranium.pelton.net>
Tue, 15 Jan 2008 20:17:20 +0000 (12:17 -0800)
commit5b073624e633364d98ab9c70299627dad79e890b
tree446ce0f98338c967e5b7c5ca744d259e12d8d377
parentc1abd75ad35c90a6adaf78ea455de82e2beaad55
parent709055be797628647620957876b99842596de852
Merge branch 'rados' of ssh://patience@ceph.newdream.net/home/sage/ceph.newdream.net/git/ceph into rados

Conflicts:

src/kernel/messenger.c