Merge pull request #5849 from ukernel/wip-32bits-ceph-fuse

author Gregory Farnum <greg@gregs42.com>

Tue, 29 Sep 2015 05:19:11 +0000 (22:19 -0700)

committer Gregory Farnum <greg@gregs42.com>

Tue, 29 Sep 2015 05:19:11 +0000 (22:19 -0700)
author Gregory Farnum <greg@gregs42.com>
Tue, 29 Sep 2015 05:19:11 +0000 (22:19 -0700)
committer Gregory Farnum <greg@gregs42.com>
Tue, 29 Sep 2015 05:19:11 +0000 (22:19 -0700)
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/Inode.h
Simple merge
diff --cc src/client/fuse_ll.cc
Simple merge
diff --cc src/common/config_opts.h
Simple merge
author	Gregory Farnum <greg@gregs42.com>
	Tue, 29 Sep 2015 05:19:11 +0000 (22:19 -0700)
committer	Gregory Farnum <greg@gregs42.com>
	Tue, 29 Sep 2015 05:19:11 +0000 (22:19 -0700)
		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/Inode.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/fuse_ll.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history