aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/proto
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-10-20 15:53:04 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-10-20 15:53:04 -0700
commit8f67b647fd7d906ed0ff9a4832c6c89c622a2396 (patch)
tree88d32916d7e313f86cbac2f0efafdc6d77148002 /src/proto
parent5a2a9eaa349897986dd6f6c4c970af7bcb4c43d6 (diff)
parent9243c74868dbf581a98f7799e71f29cd1d55d79f (diff)
Merge github.com:grpc/grpc into buffer_pools_for_realsies
Diffstat (limited to 'src/proto')
-rw-r--r--src/proto/grpc/testing/duplicate/echo_duplicate.proto1
-rw-r--r--src/proto/grpc/testing/test.proto2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/proto/grpc/testing/duplicate/echo_duplicate.proto b/src/proto/grpc/testing/duplicate/echo_duplicate.proto
index 94130ea767..97fdbc4fd3 100644
--- a/src/proto/grpc/testing/duplicate/echo_duplicate.proto
+++ b/src/proto/grpc/testing/duplicate/echo_duplicate.proto
@@ -38,4 +38,5 @@ package grpc.testing.duplicate;
service EchoTestService {
rpc Echo(grpc.testing.EchoRequest) returns (grpc.testing.EchoResponse);
+ rpc ResponseStream(EchoRequest) returns (stream EchoResponse);
}
diff --git a/src/proto/grpc/testing/test.proto b/src/proto/grpc/testing/test.proto
index d6ef58ab12..2b0dcde5a9 100644
--- a/src/proto/grpc/testing/test.proto
+++ b/src/proto/grpc/testing/test.proto
@@ -77,7 +77,7 @@ service TestService {
// The test server will not implement this method. It will be used
// to test the behavior when clients call unimplemented methods.
- rpc UnimplementedMethod(grpc.testing.Empty) returns (grpc.testing.Empty);
+ rpc UnimplementedCall(grpc.testing.Empty) returns (grpc.testing.Empty);
}
// A simple service NOT implemented at servers so clients can test for