Merge pull request #9156 from ceph/wip-cmake

author Kefu Chai <tchaikov@gmail.com>

Fri, 27 May 2016 03:37:52 +0000 (11:37 +0800)

committer Kefu Chai <tchaikov@gmail.com>

Fri, 27 May 2016 03:37:52 +0000 (11:37 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 27 May 2016 03:37:52 +0000 (11:37 +0800)
committer Kefu Chai <tchaikov@gmail.com>
Fri, 27 May 2016 03:37:52 +0000 (11:37 +0800)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/CMakeLists.txt
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 27 May 2016 03:37:52 +0000 (11:37 +0800)
committer	Kefu Chai <tchaikov@gmail.com>
	Fri, 27 May 2016 03:37:52 +0000 (11:37 +0800)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history