Merge pull request #6419 from ceph/wip-openssl

author Yehuda Sadeh <yehuda@redhat.com>

Mon, 9 Nov 2015 21:56:29 +0000 (13:56 -0800)

committer Yehuda Sadeh <yehuda@redhat.com>

Mon, 9 Nov 2015 21:56:29 +0000 (13:56 -0800)
author Yehuda Sadeh <yehuda@redhat.com>
Mon, 9 Nov 2015 21:56:29 +0000 (13:56 -0800)
committer Yehuda Sadeh <yehuda@redhat.com>
Mon, 9 Nov 2015 21:56:29 +0000 (13:56 -0800)
diff --cc ceph.spec.in
Simple merge
diff --cc src/Makefile-env.am
Simple merge
author	Yehuda Sadeh <yehuda@redhat.com>
	Mon, 9 Nov 2015 21:56:29 +0000 (13:56 -0800)
committer	Yehuda Sadeh <yehuda@redhat.com>
	Mon, 9 Nov 2015 21:56:29 +0000 (13:56 -0800)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile-env.am	patch \|	diff1 \|	diff2 \|	blob \| history