aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/distrib
diff options
context:
space:
mode:
authorGravatar Yuchen Zeng <zyc@google.com>2017-02-01 16:12:08 -0800
committerGravatar Yuchen Zeng <zyc@google.com>2017-02-01 16:12:08 -0800
commit86d2115553bb0eaf0f02c78c9f1d7696c42f424c (patch)
treec6515df23cecab3d8698257ba0dc9b17581185de /tools/distrib
parent5488d40bdd4b79fca8d0beeb0bcab126ae698996 (diff)
parente042801b1c3154cbf37b62ccc54d334689d0b0ce (diff)
Merge remote-tracking branch 'upstream/master' into cares_bazel_rule
Diffstat (limited to 'tools/distrib')
-rw-r--r--tools/distrib/python/grpcio_tools/grpc_version.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py
index 79c40717dd..263785b774 100644
--- a/tools/distrib/python/grpcio_tools/grpc_version.py
+++ b/tools/distrib/python/grpcio_tools/grpc_version.py
@@ -29,4 +29,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
-VERSION='1.1.0.dev0'
+VERSION='1.2.0.dev0'