]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd1a47d 8e252d1)
Merge branch 'rados' of ssh://yehudasa@ceph.newdream.net/git/ceph into myrados
authorYehuda Sadeh-Weinraub <yehuda@yehuda.infit.com>
Thu, 10 Jan 2008 14:20:23 +0000 (16:20 +0200)
committerYehuda Sadeh-Weinraub <yehuda@yehuda.infit.com>
Thu, 10 Jan 2008 14:20:23 +0000 (16:20 +0200)
1  2 
src/kernel/dir.c patch | diff1 | diff2 | blob | history

diff --cc src/kernel/dir.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.