[FLINK-3428] Minor fixes

nderraugh · Apr 28, 2016 · c81151e · c81151e
1 parent 6225aa6
commit c81151e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
@@ -3,9 +3,9 @@ If your changes take all of the items into account, feel free to open your pull
 In addition to going through the list, please provide a meaningful description of your changes.
 
 - [ ] General
- - The pull request references the related JIRA issue
+ - The pull request references the related JIRA issue ("[FLINK-XXX] Jira title text")
  - The pull request addresses only one issue
- - Each commit in the PR has a meaningful commit message
+ - Each commit in the PR has a meaningful commit message (including the JIRA id)
 
 - [ ] Documentation
  - Documentation has been added for new functionality

diff --git a/docs/apis/streaming/event_timestamp_extractors.md b/docs/apis/streaming/event_timestamp_extractors.md
@@ -28,9 +28,9 @@ under the License.
 {:toc}
 
 As described in the [timestamps and watermark handling]({{ site.baseurl }}/apis/streaming/event_timestamps_watermarks.html) page,
-Flink provides abstractions that allow the programmer to assign her own timestamps and emit her own watermarks. More specifically, 
-she can do so by implementing one of the `AssignerWithPeriodicWatermarks` and `AssignerWithPunctuatedWatermarks` interfaces, depending 
-on her use-case. In a nutshell, the first will emit watermarks periodically, while the second does so based on some property of 
+Flink provides abstractions that allow the programmer to assign their own timestamps and emit their own watermarks. More specifically, 
+one can do so by implementing one of the `AssignerWithPeriodicWatermarks` and `AssignerWithPunctuatedWatermarks` interfaces, depending 
+on their use-case. In a nutshell, the first will emit watermarks periodically, while the second does so based on some property of 
 the incoming records, e.g. whenever a special element is encountered in the stream.
 
 In order to further ease the programming effort for such tasks, Flink comes with some pre-implemented timestamp assigners. 

diff --git a/...a/src/main/java/org/apache/flink/streaming/api/functions/AscendingTimestampExtractor.java b/...a/src/main/java/org/apache/flink/streaming/api/functions/AscendingTimestampExtractor.java
@@ -25,12 +25,13 @@
  * ascending. In this case, the local watermarks for the streams are easy to generate, because
  * they strictly follow the timestamps.
  *
- * <b>Note:</b> This is just a stub class. The actual code for this has moved to
+ * <b>Note:</b> This is just a deprecated stub class. The actual code for this has moved to
  * {@link org.apache.flink.streaming.api.functions.timestamps.AscendingTimestampExtractor}.
  *
  * @param <T> The type of the elements that this function can extract timestamps from
  */
 @PublicEvolving
+@Deprecated
 public abstract class AscendingTimestampExtractor<T>
  extends org.apache.flink.streaming.api.functions.timestamps.AscendingTimestampExtractor<T> {