diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-12-14 11:07:56 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-12-14 11:07:56 -0800 |
| commit | 8735891b41ddc66dc3fce2188874616d8d536b95 (patch) | |
| tree | d605e4f691d33538deb0993644f60a9fac506e67 /examples | |
| parent | 1b0d2f008bb13cea43928a6aa2cbf605f9c95aab (diff) | |
| parent | f748b0ab77521bf962196e0d3aa2fdb3bf4d10af (diff) | |
Merge branch 'slice_with_exec_ctx' into metadata_filter
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/cpp/helloworld/greeter_client.cc | 2 | ||||
| -rwxr-xr-x | examples/python/multiplex/run_codegen.py | 2 | ||||
| -rw-r--r-- | examples/python/route_guide/run_codegen.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/cpp/helloworld/greeter_client.cc b/examples/cpp/helloworld/greeter_client.cc index 12209f37df..61f3953056 100644 --- a/examples/cpp/helloworld/greeter_client.cc +++ b/examples/cpp/helloworld/greeter_client.cc @@ -51,7 +51,7 @@ class GreeterClient { GreeterClient(std::shared_ptr<Channel> channel) : stub_(Greeter::NewStub(channel)) {} - // Assambles the client's payload, sends it and presents the response back + // Assembles the client's payload, sends it and presents the response back // from the server. std::string SayHello(const std::string& user) { // Data we are sending to the server. diff --git a/examples/python/multiplex/run_codegen.py b/examples/python/multiplex/run_codegen.py index 7922a0f5c7..89ac9c8fae 100755 --- a/examples/python/multiplex/run_codegen.py +++ b/examples/python/multiplex/run_codegen.py @@ -29,7 +29,7 @@ """Generates protocol messages and gRPC stubs.""" -from grpc.tools import protoc +from grpc_tools import protoc protoc.main( ( diff --git a/examples/python/route_guide/run_codegen.py b/examples/python/route_guide/run_codegen.py index c7c6008580..3751e019c9 100644 --- a/examples/python/route_guide/run_codegen.py +++ b/examples/python/route_guide/run_codegen.py @@ -29,7 +29,7 @@ """Runs protoc with the gRPC plugin to generate messages and gRPC stubs.""" -from grpc.tools import protoc +from grpc_tools import protoc protoc.main( ( |