]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #11049 from aclamk/wip-rgw-s3-crypto-sse-kms-plugin
authorCasey Bodley <cbodley@users.noreply.github.com>
Tue, 18 Apr 2017 16:25:09 +0000 (12:25 -0400)
committerGitHub <noreply@github.com>
Tue, 18 Apr 2017 16:25:09 +0000 (12:25 -0400)
rgw: s3 server-side encryption (SSE-C, SSE-KMS)

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
1  2 
src/CMakeLists.txt
src/common/config_opts.h
src/rgw/rgw_auth_s3.cc
src/rgw/rgw_common.h
src/rgw/rgw_op.cc
src/rgw/rgw_op.h
src/rgw/rgw_rados.cc
src/rgw/rgw_rest_s3.cc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge