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: b799837 5d43e27)

author	Sage Weil <sage@newdream.net>
	Fri, 15 May 2009 05:35:24 +0000 (22:35 -0700)
committer	Sage Weil <sage@newdream.net>
	Fri, 15 May 2009 05:35:24 +0000 (22:35 -0700)
commit	eba5cd6d85794bc96011d7061f0c3eb8abe256a2
tree	7d1bc7a8f8fa79a5dc2ca7d953283fd166df71f3	tree \| snapshot
parent	b79983723afe98523352188136a170fcebc56dc8	commit \| diff
parent	5d43e278a3fed23c749d6657b679b0c1415641ca	commit \| diff

Merge branch 'unstable' into rados

src/TODO	diff1 \|	diff2 \|	blob \| history
src/client/Client.cc	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	diff1 \|	diff2 \|	blob \| history
src/include/ceph_fs.h	diff1 \|	diff2 \|	blob \| history
src/kernel/mds_client.c	diff1 \|	diff2 \|	blob \| history
src/mds/CInode.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	diff1 \|	diff2 \|	blob \| history
src/osdc/Journaler.cc	diff1 \|	diff2 \|	blob \| history

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