diff options
| author |  Yang Gao <yangg@google.com> | 2016-01-14 09:16:56 -0800 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2016-01-14 09:16:56 -0800 |
| commit | cd0683330e208d003609702d3cf4e806cbcb6743 (patch) | |
| tree | 91bb860aa1143a6261e5eaf31fad343c40bfeff3 /src | |
| parent | ac3d328fa956c0024b68b083a3aa405e254a448c (diff) | |
| parent | b0d0c8e8c25685b178d8aa485169fe3fc976a142 (diff) | |
Merge pull request #4720 from sreecha/import_issues
Rename TestService to EchoTestService to prevent name-conflict with 'TestService' in test.proto
Diffstat (limited to 'src')
| -rw-r--r-- | src/proto/grpc/testing/duplicate/echo_duplicate.proto | 2 | ||||
| -rw-r--r-- | src/proto/grpc/testing/echo.proto | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/proto/grpc/testing/duplicate/echo_duplicate.proto b/src/proto/grpc/testing/duplicate/echo_duplicate.proto index d5891db4ce..94130ea767 100644 --- a/src/proto/grpc/testing/duplicate/echo_duplicate.proto +++ b/src/proto/grpc/testing/duplicate/echo_duplicate.proto @@ -36,6 +36,6 @@ import "src/proto/grpc/testing/echo_messages.proto"; package grpc.testing.duplicate; -service TestService { +service EchoTestService { rpc Echo(grpc.testing.EchoRequest) returns (grpc.testing.EchoResponse); } diff --git a/src/proto/grpc/testing/echo.proto b/src/proto/grpc/testing/echo.proto index 0896f50a99..0eef53a92a 100644 --- a/src/proto/grpc/testing/echo.proto +++ b/src/proto/grpc/testing/echo.proto @@ -34,7 +34,7 @@ import "src/proto/grpc/testing/echo_messages.proto"; package grpc.testing; -service TestService { +service EchoTestService { rpc Echo(EchoRequest) returns (EchoResponse); rpc RequestStream(stream EchoRequest) returns (EchoResponse); rpc ResponseStream(EchoRequest) returns (stream EchoResponse); |