diff options
author | 2016-04-26 16:23:53 -0700 | |
---|---|---|
committer | 2016-04-26 16:23:53 -0700 | |
commit | 6b16aaae96d7f8664870da8b4e36ea0da10d667e (patch) | |
tree | d3b6915ba019bae703f6e6d87351a454be2a3aba /src/proto | |
parent | 57d1e082689c96e2721122748b08583d6b63d394 (diff) | |
parent | a4e7ecab1a512bae1c40b9b301661ba24677b0ed (diff) |
merge and resolve conflict
Diffstat (limited to 'src/proto')
-rw-r--r-- | src/proto/grpc/binary_log/v1alpha/log.proto | 2 | ||||
-rw-r--r-- | src/proto/grpc/testing/control.proto | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/proto/grpc/binary_log/v1alpha/log.proto b/src/proto/grpc/binary_log/v1alpha/log.proto index 6cc473be74..83166cd410 100644 --- a/src/proto/grpc/binary_log/v1alpha/log.proto +++ b/src/proto/grpc/binary_log/v1alpha/log.proto @@ -105,4 +105,4 @@ message Message { // The contents of the message. May be a prefix instead of the complete // message. bytes data = 5; -}
\ No newline at end of file +} diff --git a/src/proto/grpc/testing/control.proto b/src/proto/grpc/testing/control.proto index 28769ef653..20496a8116 100644 --- a/src/proto/grpc/testing/control.proto +++ b/src/proto/grpc/testing/control.proto @@ -35,14 +35,18 @@ import "src/proto/grpc/testing/stats.proto"; package grpc.testing; enum ClientType { + // Many languages support a basic distinction between using + // sync or async client, and this allows the specification SYNC_CLIENT = 0; ASYNC_CLIENT = 1; + OTHER_CLIENT = 2; // used for some language-specific variants } enum ServerType { SYNC_SERVER = 0; ASYNC_SERVER = 1; ASYNC_GENERIC_SERVER = 2; + OTHER_SERVER = 3; // used for some language-specific variants } enum RpcType { @@ -96,6 +100,9 @@ message ClientConfig { // Specify the cores we should run the client on, if desired repeated int32 core_list = 13; int32 core_limit = 14; + + // If we use an OTHER_CLIENT client_type, this string gives more detail + string other_client_api = 15; } message ClientStatus { ClientStats stats = 1; } @@ -127,6 +134,9 @@ message ServerConfig { // Specify the cores we should run the server on, if desired repeated int32 core_list = 10; + + // If we use an OTHER_SERVER client_type, this string gives more detail + string other_server_api = 11; } message ServerArgs { |