Merge branch 'STORM-2724'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cb25186f Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cb25186f Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cb25186f Branch: refs/heads/master Commit: cb25186f5624293f71114913e4a8424fc22f75c2 Parents: ea0e465 e0494c3 Author: Jungtaek Lim <[email protected]> Authored: Sat Sep 9 08:06:07 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Sat Sep 9 08:06:07 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(-) ----------------------------------------------------------------------
