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/10/18 17:40:23 UTC

[1/2] incubator-beam git commit: Dataflow: API is in beta now

Repository: incubator-beam
Updated Branches:
  refs/heads/master 006cb127e -> 446947947


Dataflow: API is in beta now


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

Branch: refs/heads/master
Commit: 772fb3f1351bdad04adc6aeb3461daa0964cce92
Parents: 006cb12
Author: Dan Halperin <dh...@google.com>
Authored: Tue Oct 18 09:42:50 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Tue Oct 18 10:40:14 2016 -0700

----------------------------------------------------------------------
 .../org/apache/beam/runners/dataflow/util/MonitoringUtil.java    | 2 +-
 .../apache/beam/runners/dataflow/util/MonitoringUtilTest.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/772fb3f1/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/MonitoringUtil.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/MonitoringUtil.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/MonitoringUtil.java
index d014623..a6afccd 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/MonitoringUtil.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/MonitoringUtil.java
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
  */
 public final class MonitoringUtil {
 
-  private static final String GCLOUD_DATAFLOW_PREFIX = "gcloud alpha dataflow";
+  private static final String GCLOUD_DATAFLOW_PREFIX = "gcloud beta dataflow";
   private static final String ENDPOINT_OVERRIDE_ENV_VAR =
       "CLOUDSDK_API_ENDPOINT_OVERRIDES_DATAFLOW";
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/772fb3f1/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/MonitoringUtilTest.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/MonitoringUtilTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/MonitoringUtilTest.java
index 98d8ab6..6c5a2be 100644
--- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/MonitoringUtilTest.java
+++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/MonitoringUtilTest.java
@@ -133,7 +133,7 @@ public class MonitoringUtilTest {
     options.setProject(PROJECT_ID);
     options.setGcpCredential(new TestCredential());
     String cancelCommand = MonitoringUtil.getGcloudCancelCommand(options, JOB_ID);
-    assertEquals("gcloud alpha dataflow jobs --project=someProject cancel 1234", cancelCommand);
+    assertEquals("gcloud beta dataflow jobs --project=someProject cancel 1234", cancelCommand);
   }
 
   @Test
@@ -147,7 +147,7 @@ public class MonitoringUtilTest {
     String cancelCommand = MonitoringUtil.getGcloudCancelCommand(options, JOB_ID);
     assertEquals(
         "CLOUDSDK_API_ENDPOINT_OVERRIDES_DATAFLOW=https://dataflow.googleapis.com/v0neverExisted/ "
-        + "gcloud alpha dataflow jobs --project=someProject cancel 1234",
+        + "gcloud beta dataflow jobs --project=someProject cancel 1234",
         cancelCommand);
   }
 


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

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


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

Branch: refs/heads/master
Commit: 446947947585ef8c7aa2b29ac1464465793abfe2
Parents: 006cb12 772fb3f
Author: Dan Halperin <dh...@google.com>
Authored: Tue Oct 18 10:40:15 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Tue Oct 18 10:40:15 2016 -0700

----------------------------------------------------------------------
 .../org/apache/beam/runners/dataflow/util/MonitoringUtil.java    | 2 +-
 .../apache/beam/runners/dataflow/util/MonitoringUtilTest.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------