diff options
| author |  David Garcia Quintas <dgq@google.com> | 2017-12-06 16:16:49 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2017-12-06 16:16:49 -0800 |
| commit | d1966582797e0547de0f81e032b4bc5617030c79 (patch) | |
| tree | d60ed7e87bbfb7d0aaa2cee7687e85155e17bf31 /src/proto | |
| parent | 8c5c654fa32c3f139babb6a5180c01028e19b631 (diff) | |
| parent | 95e23594b026eca21151f31b039bd2a51ea67109 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into removed_expiration_interval
Diffstat (limited to 'src/proto')
| -rw-r--r-- | src/proto/grpc/testing/BUILD | 1 | ||||
| -rw-r--r-- | src/proto/grpc/testing/services.proto | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/proto/grpc/testing/BUILD b/src/proto/grpc/testing/BUILD index 36d3782262..7c49fe2472 100644 --- a/src/proto/grpc/testing/BUILD +++ b/src/proto/grpc/testing/BUILD @@ -76,7 +76,6 @@ grpc_proto_library( deps = [ "control_proto", "messages_proto", - "stats_proto", ], ) diff --git a/src/proto/grpc/testing/services.proto b/src/proto/grpc/testing/services.proto index 2e6583d99c..93c21f42d1 100644 --- a/src/proto/grpc/testing/services.proto +++ b/src/proto/grpc/testing/services.proto @@ -18,7 +18,6 @@ syntax = "proto3"; import "src/proto/grpc/testing/messages.proto"; import "src/proto/grpc/testing/control.proto"; -import "src/proto/grpc/testing/stats.proto"; package grpc.testing; |