You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by tg...@apache.org on 2017/08/15 22:25:06 UTC
[1/2] beam git commit: Fix Javadoc for waitUntilFinish
Repository: beam
Updated Branches:
refs/heads/master f7e8f886c -> 3a8b0b68c
Fix Javadoc for waitUntilFinish
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/9ff3ac3d
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/9ff3ac3d
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/9ff3ac3d
Branch: refs/heads/master
Commit: 9ff3ac3dcd61a310ed52d9bbc9f133a5ae5fb445
Parents: f7e8f88
Author: Thomas Groh <tg...@google.com>
Authored: Tue Aug 15 13:26:02 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Tue Aug 15 13:26:02 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/beam/sdk/PipelineResult.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/9ff3ac3d/sdks/java/core/src/main/java/org/apache/beam/sdk/PipelineResult.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/PipelineResult.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/PipelineResult.java
index b60de63..4a9c30a 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/PipelineResult.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/PipelineResult.java
@@ -46,14 +46,14 @@ public interface PipelineResult {
State cancel() throws IOException;
/**
- * Waits until the pipeline finishes and returns the final status.
- * It times out after the given duration.
- *
- * @param duration The time to wait for the pipeline to finish.
- * Provide a value less than 1 ms for an infinite wait.
+ * Waits until the pipeline finishes and returns the final status. It times out after the given
+ * duration.
*
+ * @param duration The time to wait for the pipeline to finish. Provide a value less than 1 ms for
+ * an infinite wait.
* @return The final state of the pipeline or null on timeout.
- * @throws UnsupportedOperationException if the runner does not support cancellation.
+ * @throws UnsupportedOperationException if the runner does not support waiting to finish with a
+ * timeout.
*/
State waitUntilFinish(Duration duration);
@@ -61,7 +61,7 @@ public interface PipelineResult {
* Waits until the pipeline finishes and returns the final status.
*
* @return The final state of the pipeline.
- * @throws UnsupportedOperationException if the runner does not support cancellation.
+ * @throws UnsupportedOperationException if the runner does not support waiting to finish.
*/
State waitUntilFinish();
[2/2] beam git commit: This closes #3718
Posted by tg...@apache.org.
This closes #3718
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/3a8b0b68
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/3a8b0b68
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/3a8b0b68
Branch: refs/heads/master
Commit: 3a8b0b68c11a73761e3d72b026962f77b743f7e9
Parents: f7e8f88 9ff3ac3
Author: Thomas Groh <tg...@google.com>
Authored: Tue Aug 15 15:24:55 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Tue Aug 15 15:24:55 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/beam/sdk/PipelineResult.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------