You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/06/12 19:33:53 UTC

[1/2] incubator-beam git commit: [BEAM-334] DataflowPipelineRunner: bump environment major version

Repository: incubator-beam
Updated Branches:
  refs/heads/master 829121960 -> 60964b611


[BEAM-334] DataflowPipelineRunner: bump environment major version


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/a2dbc41b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/a2dbc41b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/a2dbc41b

Branch: refs/heads/master
Commit: a2dbc41b406e35794b1856796c32593653dc903c
Parents: 8291219
Author: Dan Halperin <dh...@google.com>
Authored: Fri Jun 10 16:12:00 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Fri Jun 10 16:12:00 2016 -0700

----------------------------------------------------------------------
 .../org/apache/beam/runners/dataflow/DataflowPipelineRunner.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/a2dbc41b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineRunner.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineRunner.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineRunner.java
index 0c77191..2d34f23 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineRunner.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineRunner.java
@@ -215,7 +215,7 @@ public class DataflowPipelineRunner extends PipelineRunner<DataflowPipelineJob>
   private DataflowPipelineRunnerHooks hooks;
 
   // Environment version information.
-  private static final String ENVIRONMENT_MAJOR_VERSION = "4";
+  private static final String ENVIRONMENT_MAJOR_VERSION = "5";
 
   // Default Docker container images that execute Dataflow worker harness, residing in Google
   // Container Registry, separately for Batch and Streaming.


[2/2] incubator-beam git commit: Closes #447

Posted by dh...@apache.org.
Closes #447


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/60964b61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/60964b61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/60964b61

Branch: refs/heads/master
Commit: 60964b611638178787106d422063a2cdfe6b9902
Parents: 8291219 a2dbc41
Author: Dan Halperin <dh...@google.com>
Authored: Sun Jun 12 12:33:01 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Sun Jun 12 12:33:01 2016 -0700

----------------------------------------------------------------------
 .../org/apache/beam/runners/dataflow/DataflowPipelineRunner.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------