Merge branch 'master' into rq-threads-2

grpc · Aug 6, 2018 · 82f0275 · 82f0275
2 parents a2a64e5 + b85df07
commit 82f0275
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 385 deletions.
diff --git a/examples/python/multiplex/helloworld_pb2.py b/examples/python/multiplex/helloworld_pb2.py
diff --git a/examples/python/multiplex/helloworld_pb2_grpc.py b/examples/python/multiplex/helloworld_pb2_grpc.py
@@ -1,6 +1,5 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
-from grpc.framework.common import cardinality
-from grpc.framework.interfaces.face import utilities as face_utilities
 
 import helloworld_pb2 as helloworld__pb2