Merge pull request #10517 from wjwithagen/wip-wjw-freebsd-cmake-execludes

author Kefu Chai <tchaikov@gmail.com>

Thu, 1 Sep 2016 17:38:44 +0000 (01:38 +0800)

committer GitHub <noreply@github.com>

Thu, 1 Sep 2016 17:38:44 +0000 (01:38 +0800)
author Kefu Chai <tchaikov@gmail.com>
Thu, 1 Sep 2016 17:38:44 +0000 (01:38 +0800)
committer GitHub <noreply@github.com>
Thu, 1 Sep 2016 17:38:44 +0000 (01:38 +0800)
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/librbd/CMakeLists.txt
Simple merge
diff --cc src/os/CMakeLists.txt
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Thu, 1 Sep 2016 17:38:44 +0000 (01:38 +0800)
committer	GitHub <noreply@github.com>
	Thu, 1 Sep 2016 17:38:44 +0000 (01:38 +0800)
		1	2
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history