Merge pull request #7312 from jcsp/wip-14365

author Gregory Farnum <greg@gregs42.com>

Fri, 29 Jan 2016 05:28:54 +0000 (21:28 -0800)

committer Gregory Farnum <greg@gregs42.com>

Fri, 29 Jan 2016 05:28:54 +0000 (21:28 -0800)
author Gregory Farnum <greg@gregs42.com>
Fri, 29 Jan 2016 05:28:54 +0000 (21:28 -0800)
committer Gregory Farnum <greg@gregs42.com>
Fri, 29 Jan 2016 05:28:54 +0000 (21:28 -0800)
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/mds/MDCache.cc
Simple merge
diff --cc src/vstart.sh
Simple merge
author	Gregory Farnum <greg@gregs42.com>
	Fri, 29 Jan 2016 05:28:54 +0000 (21:28 -0800)
committer	Gregory Farnum <greg@gregs42.com>
	Fri, 29 Jan 2016 05:28:54 +0000 (21:28 -0800)
		1	2
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/vstart.sh	patch \|	diff1 \|	diff2 \|	blob \| history