diff options
| author | Eric Cox <eric.cox@mongodb.com> | 2022-06-22 16:58:08 +0000 |
|---|---|---|
| committer | Eric Cox <eric.cox@mongodb.com> | 2022-06-22 16:58:08 +0000 |
| commit | dce8e9938f02f7cc18744050442c64ca69091558 (patch) | |
| tree | 630fdee303fd190f8a3e75779910ba9e45c90b55 /src/mongo/idl | |
| parent | 44385b89a690f1feda55d8e888a08f33eab0a020 (diff) | |
| download | mongo-dce8e9938f02f7cc18744050442c64ca69091558.tar.gz | |
Revert "Revert "Merge branch 'v6.0' of github.com:10gen/mongo into v6.0""
This reverts commit 44385b89a690f1feda55d8e888a08f33eab0a020.
Diffstat (limited to 'src/mongo/idl')
| -rw-r--r-- | src/mongo/idl/basic_types.idl | 7 | ||||
| -rw-r--r-- | src/mongo/idl/generic_argument.idl | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/mongo/idl/basic_types.idl b/src/mongo/idl/basic_types.idl index d124f29cdae..634b05d9539 100644 --- a/src/mongo/idl/basic_types.idl +++ b/src/mongo/idl/basic_types.idl @@ -156,6 +156,13 @@ types: cpp_type: "std::array<std::uint8_t, 16>" deserializer: "mongo::BSONElement::uuid" + bindata_encrypt: + bson_serialization_type: bindata + bindata_subtype: encrypt + description: "A BSON bindata of encrypt sub type" + cpp_type: "std::vector<std::uint8_t>" + deserializer: "mongo::BSONElement::_binDataVector" + uuid: bson_serialization_type: bindata bindata_subtype: uuid diff --git a/src/mongo/idl/generic_argument.idl b/src/mongo/idl/generic_argument.idl index fdf340cbef1..5cb308bd2e1 100644 --- a/src/mongo/idl/generic_argument.idl +++ b/src/mongo/idl/generic_argument.idl @@ -104,6 +104,7 @@ generic_argument_lists: mayBypassWriteBlocking: forward_to_shards: true + generic_reply_field_lists: generic_reply_fields_api_v1: description: "Fields that may appear in any command reply. These are guaranteed backwards-compatible for as long as the server supports API Version 1." |