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: 3fe7fbb 9ccbcab)

author	Sage Weil <sage@newdream.net>
	Fri, 18 Jan 2008 01:07:25 +0000 (17:07 -0800)
committer	Sage Weil <sage@newdream.net>
	Fri, 18 Jan 2008 01:07:25 +0000 (17:07 -0800)
commit	5c097fa176e29d30f20daefbd86f023acbdc0c21
tree	15934e7598807643e5b738d78fb0d373791c5745	tree \| snapshot
parent	3fe7fbb0a67393640276994f6bdeeeccd3a7b663	commit \| diff
parent	9ccbcabc468c0d462f44cc256591214bf131499b	commit \| diff

Merge branch 'caps' into rados
- fixed up session handler along the way

src/Makefile	diff1 \|	diff2 \|	blob \| history
src/TODO	diff1 \|	diff2 \|	blob \| history
src/client/Client.cc	diff1 \|	diff2 \|	blob \| history
src/include/ceph_fs.h	diff1 \|	diff2 \|	blob \| history
src/kernel/mds_client.c	diff1 \|	diff2 \|	blob \| history
src/mds/Server.h	diff1 \|	diff2 \|	blob \| history

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