diff options
author | 2018-02-08 15:18:13 -0800 | |
---|---|---|
committer | 2018-02-08 15:18:13 -0800 | |
commit | 0693b72b7fdf7927ad120319ce53b4cf78cc11c9 (patch) | |
tree | 9af4eeefbf4e7c98ccd5264eb7280a26f637e18c /src/python/grpcio | |
parent | 5122487fad891fdf5560122285c1690a06df73d2 (diff) | |
parent | bf19c3332161b26f3942ed7b3a711bdc4dd923bc (diff) |
Merge branch 'master' into gpr_review
Diffstat (limited to 'src/python/grpcio')
-rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index b1b6c5461a..2da3c0bde8 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -266,7 +266,6 @@ CORE_SOURCE_FILES = [ 'src/core/ext/filters/client_channel/proxy_mapper.cc', 'src/core/ext/filters/client_channel/proxy_mapper_registry.cc', 'src/core/ext/filters/client_channel/resolver.cc', - 'src/core/ext/filters/client_channel/resolver_factory.cc', 'src/core/ext/filters/client_channel/resolver_registry.cc', 'src/core/ext/filters/client_channel/retry_throttle.cc', 'src/core/ext/filters/client_channel/subchannel.cc', |