flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trohrm...@apache.org
Subject flink git commit: [docs] Harmonizes watermark terminology between docs and java docs
Date Fri, 29 Jan 2016 10:31:18 GMT
Repository: flink
Updated Branches:
  refs/heads/master 6b01a8902 -> 85ac6d3d4


[docs] Harmonizes watermark terminology between docs and java docs

Henceforth, we shall only use the term lower in the context of timestamps
to denote that an event has occurred before another event.


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

Branch: refs/heads/master
Commit: 85ac6d3d4d0e4fd67d5d13bc7e97c3ca9eb587a0
Parents: 6b01a89
Author: Till Rohrmann <trohrmann@apache.org>
Authored: Fri Jan 29 11:28:22 2016 +0100
Committer: Till Rohrmann <trohrmann@apache.org>
Committed: Fri Jan 29 11:28:22 2016 +0100

----------------------------------------------------------------------
 docs/apis/streaming/index.md                                       | 2 +-
 .../main/java/org/apache/flink/streaming/api/operators/Output.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/85ac6d3d/docs/apis/streaming/index.md
----------------------------------------------------------------------
diff --git a/docs/apis/streaming/index.md b/docs/apis/streaming/index.md
index 2ba4cd9..707899a 100644
--- a/docs/apis/streaming/index.md
+++ b/docs/apis/streaming/index.md
@@ -1922,7 +1922,7 @@ a definition of time. Flink has support for three kinds of time:
 When dealing with event time, transformations need to avoid indefinite
 wait times for events to arrive. *Watermarks* provide the mechanism to control the event
time-processing time skew. Watermarks
 are emitted by the sources. A watermark with a certain timestamp denotes the knowledge that
no event
-with timestamp lower than the timestamp of the watermark will ever arrive.
+with timestamp lower or equal to the timestamp of the watermark will ever arrive.
 
 You can specify the semantics of time in a Flink DataStream program using `StreamExecutionEnviroment`,
as
 

http://git-wip-us.apache.org/repos/asf/flink/blob/85ac6d3d/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/Output.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/Output.java
b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/Output.java
index 0cbc954..78f35b2 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/Output.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/Output.java
@@ -33,7 +33,7 @@ public interface Output<T> extends Collector<T> {
 	 * Emits a {@link Watermark} from an operator. This watermark is broadcast to all downstream
 	 * operators.
 	 *
-	 * <p>A watermark specifies that no element with a timestamp older or equal to the
watermark
+	 * <p>A watermark specifies that no element with a timestamp lower or equal to the
watermark
 	 * timestamp will be emitted in the future.
 	 */
 	void emitWatermark(Watermark mark);


Mime
View raw message