diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-07-12 15:44:10 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-07-12 15:44:10 -0700 |
| commit | 1cb30c2764485864d78b226a5fc8a6f1edcb3614 (patch) | |
| tree | 198b90a32d0ff905ec0728e9d4a167fbd3e4054a /src/proto | |
| parent | 8551e4d6876de66f01f83558433e463f859eef74 (diff) | |
| parent | f2e15655bc6eaa4bbe66234946056856ede090da (diff) | |
Merge github.com:grpc/grpc into min_stack
Diffstat (limited to 'src/proto')
| -rw-r--r-- | src/proto/grpc/testing/control.proto | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/proto/grpc/testing/control.proto b/src/proto/grpc/testing/control.proto index 8cc3f55ac1..48016642f7 100644 --- a/src/proto/grpc/testing/control.proto +++ b/src/proto/grpc/testing/control.proto @@ -152,7 +152,6 @@ message ServerConfig { // Buffer pool size (no buffer pool specified if unset) int32 resource_quota_size = 1001; - repeated ChannelArg channel_args = 1002; } |