git.apps.os.sepia.ceph.com Git - ceph.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9359168 507cd9a)

author	Sage Weil <sage@newdream.net>
	Mon, 18 May 2009 20:27:37 +0000 (13:27 -0700)
committer	Sage Weil <sage@newdream.net>
	Mon, 18 May 2009 20:27:37 +0000 (13:27 -0700)
commit	78cbaf37caa2f004cc411d698f9e21000e7c29a1
tree	04b958cc5359d16882b3dde77d23993143754942	tree \| snapshot
parent	935916827827fab7a7b90ea71c01d2dc4afefc5c	commit \| diff
parent	507cd9a8c222083ce24d4a60a9ff2cd1ac853ba7	commit \| diff

Merge branch 'unstable' into rados

Conflicts:

src/include/ceph_fs.h
src/kernel/bookkeeper.h

src/include/ceph_fs.h	diff1 \|	diff2 \|	blob \| history
src/include/msgr.h	diff1 \|	\|	blob \| history
src/include/rados.h	diff1 \|	\|	blob \| history
src/kernel/debugfs.c	diff1 \|	diff2 \|	blob \| history
src/kernel/mds_client.c	diff1 \|	diff2 \|	blob \| history
src/kernel/osd_client.c	diff1 \|	diff2 \|	blob \| history
src/kernel/super.c	diff1 \|	diff2 \|	blob \| history
src/mds/CInode.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.