Merge pull request #1165 from mo22/client_fuse_multithreading

author Sage Weil <sage@inktank.com>

Sun, 2 Feb 2014 05:00:41 +0000 (21:00 -0800)

committer Sage Weil <sage@inktank.com>

Sun, 2 Feb 2014 05:00:41 +0000 (21:00 -0800)
author Sage Weil <sage@inktank.com>
Sun, 2 Feb 2014 05:00:41 +0000 (21:00 -0800)
committer Sage Weil <sage@inktank.com>
Sun, 2 Feb 2014 05:00:41 +0000 (21:00 -0800)
diff --cc src/client/fuse_ll.cc
Simple merge
diff --cc src/common/config_opts.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Sun, 2 Feb 2014 05:00:41 +0000 (21:00 -0800)
committer	Sage Weil <sage@inktank.com>
	Sun, 2 Feb 2014 05:00:41 +0000 (21:00 -0800)
		1	2
src/client/fuse_ll.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history