diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-09-02 12:46:44 +0200 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-09-02 12:46:44 +0200 |
| commit | d1a47f1627481b7886642f32724170f39a733897 (patch) | |
| tree | 7a370ff84a6355988b562a50f822703368bc0745 /src/python/grpcio/grpc_core_dependencies.py | |
| parent | b8245bd231f4b38a656615c3e8d43e89f853343a (diff) | |
| parent | 79620aaa1052fd02539a36caa63cbe24a2087b0f (diff) | |
Merge branch 'master' of github.com:grpc/grpc into lb_add_md
Diffstat (limited to 'src/python/grpcio/grpc_core_dependencies.py')
| -rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 660e34d742..725134c3a4 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -233,7 +233,6 @@ CORE_SOURCE_FILES = [ 'src/core/ext/client_config/resolver_registry.c', 'src/core/ext/client_config/resolver_result.c', 'src/core/ext/client_config/subchannel.c', - 'src/core/ext/client_config/subchannel_call_holder.c', 'src/core/ext/client_config/subchannel_index.c', 'src/core/ext/client_config/uri_parser.c', 'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c', @@ -255,6 +254,7 @@ CORE_SOURCE_FILES = [ 'src/core/ext/census/base_resources.c', 'src/core/ext/census/context.c', 'src/core/ext/census/gen/census.pb.c', + 'src/core/ext/census/gen/trace_context.pb.c', 'src/core/ext/census/grpc_context.c', 'src/core/ext/census/grpc_filter.c', 'src/core/ext/census/grpc_plugin.c', |