]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'master' into rados
authorSage Weil <sage@newdream.net>
Fri, 4 Jan 2008 20:51:19 +0000 (12:51 -0800)
committerSage Weil <sage@newdream.net>
Fri, 4 Jan 2008 20:51:19 +0000 (12:51 -0800)
commit4aff23aa9536e78d519069fd1dba297b309dd4d5
treef5d731b5c7a810c928773455d127d1eba4668f06
parentc370a7e2dfc60ae2e783907714b0eedade5badae
parent95efa1fe0a14be66fb49cc87697804310d09d94d
Merge branch 'master' into rados

Conflicts:

src/include/ceph_fs.h
src/include/ceph_fs.h
src/kernel/messenger.h
src/msg/SimpleMessenger.cc