You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2016/07/15 00:26:29 UTC

[1/2] incubator-beam git commit: Update Dataflow container image

Repository: incubator-beam
Updated Branches:
  refs/heads/master 9bd5c1a83 -> 7a618034d


Update Dataflow container image

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

Branch: refs/heads/master
Commit: 8030f0d53ce0b783734e7046c1521cdad7044fa2
Parents: f0119b2
Author: Daniel Halperin <dh...@users.noreply.github.com>
Authored: Thu Jul 14 08:48:37 2016 -0700
Committer: GitHub <no...@github.com>
Committed: Thu Jul 14 08:48:37 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/beam/runners/dataflow/DataflowRunner.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8030f0d5/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
index 1f2fdca..fa61587 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
@@ -218,9 +218,9 @@ public class DataflowRunner extends PipelineRunner<DataflowPipelineJob> {
   // Default Docker container images that execute Dataflow worker harness, residing in Google
   // Container Registry, separately for Batch and Streaming.
   public static final String BATCH_WORKER_HARNESS_CONTAINER_IMAGE
-      = "dataflow.gcr.io/v1beta3/beam-java-batch:beam-master-20160613";
+      = "dataflow.gcr.io/v1beta3/beam-java-batch:beam-master-20160714";
   public static final String STREAMING_WORKER_HARNESS_CONTAINER_IMAGE
-      = "dataflow.gcr.io/v1beta3/beam-java-streaming:beam-master-20160613";
+      = "dataflow.gcr.io/v1beta3/beam-java-streaming:beam-master-20160714";
 
   // The limit of CreateJob request size.
   private static final int CREATE_JOB_REQUEST_LIMIT_BYTES = 10 * 1024 * 1024;


[2/2] incubator-beam git commit: This closes #655

Posted by ke...@apache.org.
This closes #655


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

Branch: refs/heads/master
Commit: 7a618034d308e32b9d2c1142ba637c5346fcdfb6
Parents: 9bd5c1a 8030f0d
Author: Kenneth Knowles <kl...@google.com>
Authored: Thu Jul 14 17:26:13 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Thu Jul 14 17:26:13 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/beam/runners/dataflow/DataflowRunner.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------