Merge branch 'STORM-2724-1.1.x-merge' into 1.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/3202257a Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3202257a Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3202257a Branch: refs/heads/1.1.x-branch Commit: 3202257ab01becb85de3a972220382b2930274db Parents: bd830c3 9f29be3 Author: Jungtaek Lim <[email protected]> Authored: Sat Sep 9 08:07:13 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Sat Sep 9 08:07:13 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(-) ----------------------------------------------------------------------
