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 2017/01/19 17:34:33 UTC

[1/2] beam git commit: Improve documentation of workerDiskType in Dataflow runner

Repository: beam
Updated Branches:
  refs/heads/master 603f4fb04 -> b2d300858


Improve documentation of workerDiskType in Dataflow runner


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

Branch: refs/heads/master
Commit: 2061f05aae6ddc1eb19a6b43fc0c024f9bb78b8f
Parents: 603f4fb
Author: feczo <sz...@gmail.com>
Authored: Fri Dec 30 13:49:12 2016 +1100
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Jan 19 09:34:16 2017 -0800

----------------------------------------------------------------------
 .../options/DataflowPipelineWorkerPoolOptions.java  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/2061f05a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineWorkerPoolOptions.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineWorkerPoolOptions.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineWorkerPoolOptions.java
index 05086b0..3c5d05a 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineWorkerPoolOptions.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineWorkerPoolOptions.java
@@ -205,15 +205,15 @@ public interface DataflowPipelineWorkerPoolOptions extends PipelineOptions {
   void setFilesToStage(List<String> value);
 
   /**
-   * Specifies what type of persistent disk should be used. The value should be a full or partial
-   * URL of a disk type resource, e.g., zones/us-central1-f/disks/pd-standard. For
-   * more information, see the
-   * <a href="https://cloud.google.com/compute/docs/reference/latest/diskTypes">API reference
-   * documentation for DiskTypes</a>.
+   * Specifies what type of persistent disk is used. The value is a full disk type resource,
+   * e.g., compute.googleapis.com/projects//zones//diskTypes/pd-ssd. For more information,
+   * see the <a href="https://cloud.google.com/compute/docs/reference/latest/diskTypes">API
+   * reference documentation for DiskTypes</a>.
    */
-  @Description("Specifies what type of persistent disk should be used. The value should be a full "
-      + "or partial URL of a disk type resource, e.g., zones/us-central1-f/disks/pd-standard. For "
-      + "more information, see the API reference documentation for DiskTypes: "
+  @Description("Specifies what type of persistent disk is used. The "
+      + "value is a full URL of a disk type resource, e.g., "
+      + "compute.googleapis.com/projects//zones//diskTypes/pd-ssd. For more "
+      + "information, see the API reference documentation for DiskTypes: "
       + "https://cloud.google.com/compute/docs/reference/latest/diskTypes")
   String getWorkerDiskType();
   void setWorkerDiskType(String value);


[2/2] beam git commit: This closes #1719

Posted by dh...@apache.org.
This closes #1719


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

Branch: refs/heads/master
Commit: b2d30085822159f61f4db7cfad9c545f9355c46c
Parents: 603f4fb 2061f05
Author: Dan Halperin <dh...@google.com>
Authored: Thu Jan 19 09:34:21 2017 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Jan 19 09:34:21 2017 -0800

----------------------------------------------------------------------
 .../options/DataflowPipelineWorkerPoolOptions.java  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------