Merge branch 'next'

author Sage Weil <sage@inktank.com>

Sat, 10 Nov 2012 10:40:33 +0000 (02:40 -0800)

committer Sage Weil <sage@inktank.com>

Sat, 10 Nov 2012 10:40:33 +0000 (02:40 -0800)
author Sage Weil <sage@inktank.com>
Sat, 10 Nov 2012 10:40:33 +0000 (02:40 -0800)
committer Sage Weil <sage@inktank.com>
Sat, 10 Nov 2012 10:40:33 +0000 (02:40 -0800)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
diff --cc src/client/Inode.cc
Simple merge
diff --cc src/client/fuse_ll.cc
Simple merge
diff --cc src/osdc/ObjectCacher.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Sat, 10 Nov 2012 10:40:33 +0000 (02:40 -0800)
committer	Sage Weil <sage@inktank.com>
	Sat, 10 Nov 2012 10:40:33 +0000 (02:40 -0800)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Inode.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/fuse_ll.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/ObjectCacher.cc	patch \|	diff1 \|	diff2 \|	blob \| history