diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-11-30 09:06:22 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-11-30 09:08:01 +0100 |
| commit | 7d199c95a2af62463c40b5ab3e9a4aa699b2754d (patch) | |
| tree | 51fdb358b646bb495d405efaf7bfb68f601ab8fd /src/python | |
| parent | de6e1f5a6f85ee54086d5f284ad882abe1f4713a (diff) | |
| parent | ba89ad406541bbf074071c7b7ee54f1849119ffe (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into v1.8.x
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/grpcio/grpc/_grpcio_metadata.py | 2 | ||||
| -rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 4 | ||||
| -rw-r--r-- | src/python/grpcio/grpc_version.py | 2 | ||||
| -rw-r--r-- | src/python/grpcio_health_checking/grpc_version.py | 2 | ||||
| -rw-r--r-- | src/python/grpcio_reflection/grpc_version.py | 2 | ||||
| -rw-r--r-- | src/python/grpcio_testing/grpc_version.py | 2 | ||||
| -rw-r--r-- | src/python/grpcio_tests/grpc_version.py | 2 |
7 files changed, 9 insertions, 7 deletions
diff --git a/src/python/grpcio/grpc/_grpcio_metadata.py b/src/python/grpcio/grpc/_grpcio_metadata.py index 6c224b031e..8ebefbf70a 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.8.0rc1""" +__version__ = """1.8.0rc2""" diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 330c4185c6..56d6ebd842 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -29,6 +29,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/support/env_linux.cc', 'src/core/lib/support/env_posix.cc', 'src/core/lib/support/env_windows.cc', + 'src/core/lib/support/fork.cc', 'src/core/lib/support/histogram.cc', 'src/core/lib/support/host_port.cc', 'src/core/lib/support/log.cc', @@ -38,7 +39,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/support/log_windows.cc', 'src/core/lib/support/mpscq.cc', 'src/core/lib/support/murmur_hash.cc', - 'src/core/lib/support/stack_lockfree.cc', 'src/core/lib/support/string.cc', 'src/core/lib/support/string_posix.cc', 'src/core/lib/support/string_util_windows.cc', @@ -94,6 +94,8 @@ CORE_SOURCE_FILES = [ 'src/core/lib/iomgr/ev_windows.cc', 'src/core/lib/iomgr/exec_ctx.cc', 'src/core/lib/iomgr/executor.cc', + 'src/core/lib/iomgr/fork_posix.cc', + 'src/core/lib/iomgr/fork_windows.cc', 'src/core/lib/iomgr/gethostname_fallback.cc', 'src/core/lib/iomgr/gethostname_host_name_max.cc', 'src/core/lib/iomgr/gethostname_sysconf.cc', diff --git a/src/python/grpcio/grpc_version.py b/src/python/grpcio/grpc_version.py index b43b5324d2..d65b63ec9c 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.8.0rc1' +VERSION='1.8.0rc2' diff --git a/src/python/grpcio_health_checking/grpc_version.py b/src/python/grpcio_health_checking/grpc_version.py index 28dafde8cf..7399e3a491 100644 --- a/src/python/grpcio_health_checking/grpc_version.py +++ b/src/python/grpcio_health_checking/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!! -VERSION='1.8.0rc1' +VERSION='1.8.0rc2' diff --git a/src/python/grpcio_reflection/grpc_version.py b/src/python/grpcio_reflection/grpc_version.py index 5e90b55daf..68d281c059 100644 --- a/src/python/grpcio_reflection/grpc_version.py +++ b/src/python/grpcio_reflection/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!! -VERSION='1.8.0rc1' +VERSION='1.8.0rc2' diff --git a/src/python/grpcio_testing/grpc_version.py b/src/python/grpcio_testing/grpc_version.py index aef43f181c..7c60bbfd89 100644 --- a/src/python/grpcio_testing/grpc_version.py +++ b/src/python/grpcio_testing/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!! -VERSION='1.8.0rc1' +VERSION='1.8.0rc2' diff --git a/src/python/grpcio_tests/grpc_version.py b/src/python/grpcio_tests/grpc_version.py index 4f946d346e..6c8fb62357 100644 --- a/src/python/grpcio_tests/grpc_version.py +++ b/src/python/grpcio_tests/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!! -VERSION='1.8.0rc1' +VERSION='1.8.0rc2' |