You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2016/09/27 17:12:45 UTC
[1/2] incubator-beam git commit: Update Dataflow worker image for
Apache Beam
Repository: incubator-beam
Updated Branches:
refs/heads/master 68010aba1 -> 1556eb77f
Update Dataflow worker image for Apache Beam
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/a11c9618
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/a11c9618
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/a11c9618
Branch: refs/heads/master
Commit: a11c9618996b370c42d015c6d238532c5393aacb
Parents: 68010ab
Author: Luke Cwik <lc...@google.com>
Authored: Mon Sep 26 19:25:39 2016 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Tue Sep 27 10:11:44 2016 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
.../java/org/apache/beam/runners/dataflow/DataflowRunner.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/a11c9618/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cc93bb9..8104e11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
<joda.version>2.4</joda.version>
<junit.version>4.11</junit.version>
<mockito.version>1.9.5</mockito.version>
- <netty.version>4.1.1.Final</netty.version>
+ <netty.version>4.1.3.Final</netty.version>
<os-maven-plugin.version>1.4.0.Final</os-maven-plugin.version>
<protobuf.version>3.0.0</protobuf.version>
<pubsub.version>v1-rev10-1.22.0</pubsub.version>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/a11c9618/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 d067b61..54c95a7 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
@@ -206,9 +206,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-20160826";
+ "dataflow.gcr.io/v1beta3/beam-java-batch:beam-master-20160926";
public static final String STREAMING_WORKER_HARNESS_CONTAINER_IMAGE =
- "dataflow.gcr.io/v1beta3/beam-java-streaming:beam-master-20160826";
+ "dataflow.gcr.io/v1beta3/beam-java-streaming:beam-master-20160926";
// The limit of CreateJob request size.
private static final int CREATE_JOB_REQUEST_LIMIT_BYTES = 10 * 1024 * 1024;
[2/2] incubator-beam git commit: [BEAM-679] Update Dataflow worker
image for Apache Beam / Fix Netty Version
Posted by lc...@apache.org.
[BEAM-679] Update Dataflow worker image for Apache Beam / Fix Netty Version
This closes #1012
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/1556eb77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/1556eb77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/1556eb77
Branch: refs/heads/master
Commit: 1556eb77fb8e902ac3af6514f61457c83fe5d2d0
Parents: 68010ab a11c961
Author: Luke Cwik <lc...@google.com>
Authored: Tue Sep 27 10:12:30 2016 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Tue Sep 27 10:12:30 2016 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
.../java/org/apache/beam/runners/dataflow/DataflowRunner.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------