]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #40094 into pacific
authorSage Weil <sage@newdream.net>
Wed, 24 Mar 2021 15:34:03 +0000 (10:34 -0500)
committerSage Weil <sage@newdream.net>
Wed, 24 Mar 2021 15:34:03 +0000 (10:34 -0500)
commitfd3042d1e02ba3e75c1021d146a7a024f4c62ff3
tree0ddb82dfdf10bace014a9ebc50ac8e717288005d
parent20332af6c925c1e0f67f13602a1bd2d349a9b939
parent2eae08965e0f0d41c2799850e20e9f3d903f2166
Merge PR #40094 into pacific

* refs/pull/40094/head:
rgw/kms/vault - PendingReleaseNotes pointer
rgw/kms/vault - s3tests for both old and new test logic.
rgw/kms/vault - rework unit test logic for new transit logic.
rgw/kms/vault - 0 terminate before rapidjson
rgw/kms/vault - document configuration for new transit logic
rgw/kms/vault - new transit logic - fix compat logic
rgw/kms/vault - define attribute for new transit logic
rgw/kms/vault - "compat" option
rgw/kms/vault - encryption context - first part
rgw/kms/vault - define attribute to store encryption context
rgw/kms/vault - share get/set attr between rgw_crypt.cc and rgw_kms.cc
rgw/kms/vault - relax configuration parsing for rgw_crypt_vault_secret_engine
rgw/kms/vault - need libicu to make canonical json for encryption contexts.
rgw/kms/kmip - document configuration for a new feature: kmip kms
rgw/kms/kmip - rgw / kmip test integration.
rgw/kms/kmip - rgw / kmip test integration.
rgw/kms/kmip - rgw / kmip test integration.
rgw/kms/kmip - correct documentation.
rgw/kms/kmip - pykmip.py needs to make keys too.
rgw/kms/kmip - pykmip.py should actually run pykmip.
rgw/kms/kmip - python3 changes for testing.
rgw/kms/kmip - string handling cleanup.
teuthology/rgw: pykmip task
kmip: first pass at implementation logic.
kmip: configuration options.
Including cmake build logic inside of libkmip.
cmake glue to build libkmip.
Added libkmip as a submodule.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
PendingReleaseNotes
ceph.spec.in
src/common/legacy_config_opts.h
src/common/options.cc
src/rgw/rgw_common.h
src/rgw/rgw_main.cc