Merge pull request #15070 from ceph/wip-turn-off-fcgi-tserlin

author Matt Benjamin <mbenjamin@redhat.com>

Wed, 24 May 2017 19:53:57 +0000 (15:53 -0400)

committer GitHub <noreply@github.com>

Wed, 24 May 2017 19:53:57 +0000 (15:53 -0400)
author Matt Benjamin <mbenjamin@redhat.com>
Wed, 24 May 2017 19:53:57 +0000 (15:53 -0400)
committer GitHub <noreply@github.com>
Wed, 24 May 2017 19:53:57 +0000 (15:53 -0400)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/test/CMakeLists.txt
Simple merge
author	Matt Benjamin <mbenjamin@redhat.com>
	Wed, 24 May 2017 19:53:57 +0000 (15:53 -0400)
committer	GitHub <noreply@github.com>
	Wed, 24 May 2017 19:53:57 +0000 (15:53 -0400)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history