Merge pull request #10837 from ceph/wip-cmake

author Kefu Chai <tchaikov@gmail.com>

Fri, 26 Aug 2016 14:51:58 +0000 (22:51 +0800)

committer GitHub <noreply@github.com>

Fri, 26 Aug 2016 14:51:58 +0000 (22:51 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 26 Aug 2016 14:51:58 +0000 (22:51 +0800)
committer GitHub <noreply@github.com>
Fri, 26 Aug 2016 14:51:58 +0000 (22:51 +0800)
diff --cc src/test/CMakeLists.txt
Simple merge
diff --cc src/test/librbd/CMakeLists.txt
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 26 Aug 2016 14:51:58 +0000 (22:51 +0800)
committer	GitHub <noreply@github.com>
	Fri, 26 Aug 2016 14:51:58 +0000 (22:51 +0800)
		1	2
src/test/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/librbd/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history