aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/proto
diff options
context:
space:
mode:
authorGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2016-09-08 01:58:49 +0200
committerGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2016-09-08 01:58:49 +0200
commit5928bff0c7765766af2ea1ce8120317810eb4f8c (patch)
treeb6d74bcac7fb0c3e83d466a6b07660237b0c3d63 /src/proto
parent483f90b5da6765a05e7807a1a9a7e2f2d0484b28 (diff)
parent7a209ace0e6c3b67fcefdfd3a2e50620312ee3a2 (diff)
Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge
Diffstat (limited to 'src/proto')
-rw-r--r--src/proto/grpc/testing/echo.proto2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/proto/grpc/testing/echo.proto b/src/proto/grpc/testing/echo.proto
index c596aabfcc..ca60a41b4f 100644
--- a/src/proto/grpc/testing/echo.proto
+++ b/src/proto/grpc/testing/echo.proto
@@ -42,7 +42,7 @@ service EchoTestService {
rpc Unimplemented(EchoRequest) returns (EchoResponse);
}
-service UnimplementedService {
+service UnimplementedEchoService {
rpc Unimplemented(EchoRequest) returns (EchoResponse);
}