You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/09/08 23:07:29 UTC
[2/2] storm git commit: Merge branch 'STORM-2724-1.x' into 1.x-branch
Merge branch 'STORM-2724-1.x' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e462979b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e462979b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e462979b
Branch: refs/heads/1.x-branch
Commit: e462979b370098d3c8491a20e0c71c738562f895
Parents: e178990 a648db5
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Sep 9 08:06:29 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Sep 9 08:06:29 2017 +0900
----------------------------------------------------------------------
.../storm/topology/WindowedBoltExecutor.java | 1 +
.../storm/windowing/TimeTriggerPolicy.java | 8 ++++++-
.../windowing/WaterMarkEventGenerator.java | 25 +++++++++++++++++++-
.../windowing/WaterMarkEventGeneratorTest.java | 6 +++++
4 files changed, 38 insertions(+), 2 deletions(-)
----------------------------------------------------------------------