[beam] 01/01: Create release branch for version 2.6.0.

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pabloem pushed a commit to branch release-2.6.0
in repository https://gitbox.apache.org/repos/asf/beam.git

commit 39c95147ddce6c3a0334c74c0c17fcd05ab36a5c
Author: Pablo <pa...@google.com>
AuthorDate: Wed Jul 18 10:55:23 2018 -0700

    Create release branch for version 2.6.0.
---
 runners/google-cloud-dataflow-java/build.gradle | 2 +-
 sdks/python/apache_beam/version.py              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle
index 98535fa..e964feb 100644
--- a/runners/google-cloud-dataflow-java/build.gradle
+++ b/runners/google-cloud-dataflow-java/build.gradle
@@ -36,7 +36,7 @@ processResources {
   filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [
     'dataflow.legacy_environment_major_version' : '7',
     'dataflow.fnapi_environment_major_version' : '7',
-    'dataflow.container_version' : 'beam-master-20180710'
+    'dataflow.container_version' : 'beam-2.6.0
   ]
 }
 
diff --git a/sdks/python/apache_beam/version.py b/sdks/python/apache_beam/version.py
index 9b9ab38..97b8413 100644
--- a/sdks/python/apache_beam/version.py
+++ b/sdks/python/apache_beam/version.py
@@ -18,4 +18,4 @@
 """Apache Beam SDK version information and utilities."""
 
 
-__version__ = '2.6.0.dev'
+__version__ = '2.6.0'