diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2018-11-21 11:48:41 -0800 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2018-11-21 11:48:41 -0800 |
| commit | 248e30467146efe8bc6f4f05140ae886d743c72d (patch) | |
| tree | 73de256fb95a03f6c56fb7fb8e6e0b45f8f1d402 /src/python/grpcio | |
| parent | d704cfe3d11ae32a833e9b995f87d5e2d15bacef (diff) | |
| parent | abbfd89dfc7e140fb1658f671b36e3276bfc37ce (diff) | |
Merge branch 'master' into httpplumbing
Diffstat (limited to 'src/python/grpcio')
| -rw-r--r-- | src/python/grpcio/grpc/_grpcio_metadata.py | 2 | ||||
| -rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 2 | ||||
| -rw-r--r-- | src/python/grpcio/grpc_version.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/python/grpcio/grpc/_grpcio_metadata.py b/src/python/grpcio/grpc/_grpcio_metadata.py index 42b3a1ad49..7a9f173947 100644 --- a/src/python/grpcio/grpc/_grpcio_metadata.py +++ b/src/python/grpcio/grpc/_grpcio_metadata.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!! -__version__ = """1.17.0.dev0""" +__version__ = """1.18.0.dev0""" diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 2c929102cc..ce65c594fe 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -324,12 +324,12 @@ CORE_SOURCE_FILES = [ 'src/core/ext/filters/client_channel/lb_policy.cc', 'src/core/ext/filters/client_channel/lb_policy_factory.cc', 'src/core/ext/filters/client_channel/lb_policy_registry.cc', - 'src/core/ext/filters/client_channel/method_params.cc', 'src/core/ext/filters/client_channel/parse_address.cc', '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_registry.cc', + 'src/core/ext/filters/client_channel/resolver_result_parsing.cc', 'src/core/ext/filters/client_channel/retry_throttle.cc', 'src/core/ext/filters/client_channel/subchannel.cc', 'src/core/ext/filters/client_channel/subchannel_index.cc', diff --git a/src/python/grpcio/grpc_version.py b/src/python/grpcio/grpc_version.py index 71113e68d9..2e91818d2c 100644 --- a/src/python/grpcio/grpc_version.py +++ b/src/python/grpcio/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!! -VERSION = '1.17.0.dev0' +VERSION = '1.18.0.dev0' |