]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #14215 from mdw-at-linuxbox/wip-jewel-rgw-openssl-fix1
authorKen Dreyer <kdreyer@redhat.com>
Fri, 31 Mar 2017 16:09:14 +0000 (10:09 -0600)
committerKen Dreyer <kdreyer@redhat.com>
Fri, 31 Mar 2017 16:10:51 +0000 (10:10 -0600)
rgw: fix openssl

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
CMakeLists.txt
configure.ac
src/CMakeLists.txt
src/rgw/Makefile.am
src/rgw/rgw_civetweb.cc
src/rgw/rgw_main.cc
src/rgw/rgw_rest_s3.cc

diff --cc CMakeLists.txt
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge