Merge pull request #11343 from ceph/wip-civetweb-1.8

author Yehuda Sadeh <yehuda@redhat.com>

Sat, 5 Nov 2016 19:53:23 +0000 (12:53 -0700)

committer GitHub <noreply@github.com>

Sat, 5 Nov 2016 19:53:23 +0000 (12:53 -0700)
author Yehuda Sadeh <yehuda@redhat.com>
Sat, 5 Nov 2016 19:53:23 +0000 (12:53 -0700)
committer GitHub <noreply@github.com>
Sat, 5 Nov 2016 19:53:23 +0000 (12:53 -0700)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/CMakeLists.txt
Simple merge
author	Yehuda Sadeh <yehuda@redhat.com>
	Sat, 5 Nov 2016 19:53:23 +0000 (12:53 -0700)
committer	GitHub <noreply@github.com>
	Sat, 5 Nov 2016 19:53:23 +0000 (12:53 -0700)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history