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/04/07 00:58:14 UTC
[1/2] incubator-beam git commit: Closes #140 Closes #137
Repository: incubator-beam
Updated Branches:
refs/heads/master cdfe50932 -> 8b7657058
Closes #140 Closes #137
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/8b765705
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/8b765705
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/8b765705
Branch: refs/heads/master
Commit: 8b76570580322031cc68b2d54efb2c9c3a9ef567
Parents: cdfe509 9ed1465
Author: Dan Halperin <dh...@google.com>
Authored: Wed Apr 6 15:50:26 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Wed Apr 6 15:50:26 2016 -0700
----------------------------------------------------------------------
.../dataflow/sdk/options/DataflowPipelineWorkerPoolOptions.java | 5 ++++-
.../dataflow/sdk/runners/DataflowPipelineTranslatorTest.java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/2] incubator-beam git commit: Correct URL for subnetwork
Posted by dh...@apache.org.
Correct URL for subnetwork
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/9ed14656
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/9ed14656
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/9ed14656
Branch: refs/heads/master
Commit: 9ed1465699d017e1ea35771ca46ef8fd2fb498c3
Parents: cdfe509
Author: Rafal Wojdyla <ra...@spotify.com>
Authored: Tue Apr 5 18:10:00 2016 -0400
Committer: Dan Halperin <dh...@google.com>
Committed: Wed Apr 6 15:50:26 2016 -0700
----------------------------------------------------------------------
.../dataflow/sdk/options/DataflowPipelineWorkerPoolOptions.java | 5 ++++-
.../dataflow/sdk/runners/DataflowPipelineTranslatorTest.java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/9ed14656/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineWorkerPoolOptions.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineWorkerPoolOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineWorkerPoolOptions.java
index d608ccf..0c6428f 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineWorkerPoolOptions.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineWorkerPoolOptions.java
@@ -149,7 +149,10 @@ public interface DataflowPipelineWorkerPoolOptions extends PipelineOptions {
* GCE <a href="https://cloud.google.com/compute/docs/networking">subnetwork</a> for launching
* workers.
*
- * <p>Default is up to the Dataflow service. Expected format is zones/ZONE/subnetworks/SUBNETWORK.
+ * <p>Default is up to the Dataflow service. Expected format is
+ * regions/REGION/subnetworks/SUBNETWORK.
+ *
+ * <p>You may also need to specify network option.
*/
@Description("GCE subnetwork for launching workers. For more information, see the reference "
+ "documentation https://cloud.google.com/compute/docs/networking. "
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/9ed14656/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineTranslatorTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineTranslatorTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineTranslatorTest.java
index af08447..1b32b73 100644
--- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineTranslatorTest.java
+++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineTranslatorTest.java
@@ -238,7 +238,7 @@ public class DataflowPipelineTranslatorTest implements Serializable {
@Test
public void testSubnetworkConfig() throws IOException {
- final String testSubnetwork = "zones/ZONE/subnetworks/SUBNETWORK";
+ final String testSubnetwork = "regions/REGION/subnetworks/SUBNETWORK";
DataflowPipelineOptions options = buildPipelineOptions();
options.setSubnetwork(testSubnetwork);