]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #29783 from scarvalhojr/ssevault
authorAli Maredia <amaredia@redhat.com>
Mon, 7 Oct 2019 02:33:36 +0000 (22:33 -0400)
committerGitHub <noreply@github.com>
Mon, 7 Oct 2019 02:33:36 +0000 (22:33 -0400)
rgw: add SSE-KMS with Vault using token auth

1  2 
src/common/legacy_config_opts.h
src/common/options.cc
src/rgw/CMakeLists.txt
src/vstart.sh

Simple merge
Simple merge
Simple merge
diff --cc src/vstart.sh
Simple merge