]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'rados' of ssh://ceph.newdream.net/git/ceph into rados
authorYehuda Sadeh <yehuda@hq.newdream.net>
Mon, 18 May 2009 22:51:36 +0000 (15:51 -0700)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Mon, 18 May 2009 22:51:36 +0000 (15:51 -0700)
commit8def9d32f6ca32cfd7e19c2723b991ea99800de0
tree3f91df6ea7529e1b903de0622641bc1229296594
parentbdc16c8da59314e4d9c0f69d162b9fe2f48ed2e3
parent78cbaf37caa2f004cc411d698f9e21000e7c29a1
Merge branch 'rados' of ssh://ceph.newdream.net/git/ceph into rados

Conflicts:

src/kernel/bookkeeper.h
src/include/rados.h
src/kernel/bookkeeper.h
src/osd/OSD.cc