Merge pull request #5416 from zhouyuan/ceph_fuse_12204

author Gregory Farnum <greg@gregs42.com>

Mon, 21 Sep 2015 23:02:33 +0000 (16:02 -0700)

committer Gregory Farnum <greg@gregs42.com>

Mon, 21 Sep 2015 23:02:33 +0000 (16:02 -0700)
author Gregory Farnum <greg@gregs42.com>
Mon, 21 Sep 2015 23:02:33 +0000 (16:02 -0700)
committer Gregory Farnum <greg@gregs42.com>
Mon, 21 Sep 2015 23:02:33 +0000 (16:02 -0700)
diff --cc src/ceph_fuse.cc
Simple merge
diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
diff --cc src/common/config_opts.h
Simple merge
author	Gregory Farnum <greg@gregs42.com>
	Mon, 21 Sep 2015 23:02:33 +0000 (16:02 -0700)
committer	Gregory Farnum <greg@gregs42.com>
	Mon, 21 Sep 2015 23:02:33 +0000 (16:02 -0700)
		1	2
src/ceph_fuse.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history