Merge pull request #11776 from ceph/wip-rgw-openssl-7

author Matt Benjamin <mbenjamin@redhat.com>

Fri, 6 Jan 2017 17:08:38 +0000 (12:08 -0500)

committer GitHub <noreply@github.com>

Fri, 6 Jan 2017 17:08:38 +0000 (12:08 -0500)
author Matt Benjamin <mbenjamin@redhat.com>
Fri, 6 Jan 2017 17:08:38 +0000 (12:08 -0500)
committer GitHub <noreply@github.com>
Fri, 6 Jan 2017 17:08:38 +0000 (12:08 -0500)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
author	Matt Benjamin <mbenjamin@redhat.com>
	Fri, 6 Jan 2017 17:08:38 +0000 (12:08 -0500)
committer	GitHub <noreply@github.com>
	Fri, 6 Jan 2017 17:08:38 +0000 (12:08 -0500)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history