Merge remote-tracking branch 'gh/master' into infernalis

author Sage Weil <sage@redhat.com>

Thu, 3 Sep 2015 19:15:01 +0000 (15:15 -0400)

committer Sage Weil <sage@redhat.com>

Thu, 3 Sep 2015 19:15:01 +0000 (15:15 -0400)
author Sage Weil <sage@redhat.com>
Thu, 3 Sep 2015 19:15:01 +0000 (15:15 -0400)
committer Sage Weil <sage@redhat.com>
Thu, 3 Sep 2015 19:15:01 +0000 (15:15 -0400)
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/test/CMakeLists.txt
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 3 Sep 2015 19:15:01 +0000 (15:15 -0400)
committer	Sage Weil <sage@redhat.com>
	Thu, 3 Sep 2015 19:15:01 +0000 (15:15 -0400)
		1	2
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history