Merge branch 'STORM-2811-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/ed005ab5 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ed005ab5 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ed005ab5 Branch: refs/heads/1.1.x-branch Commit: ed005ab5fee7c9650c5c2b6ec2cbfb772799da93 Parents: ff3ab99 ccfdd44 Author: Jungtaek Lim <[email protected]> Authored: Tue Nov 14 08:27:28 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Tue Nov 14 08:27:28 2017 +0900 ---------------------------------------------------------------------- integration-test/src/test/java/org/apache/storm/st/DemoTest.java | 1 + .../java/org/apache/storm/st/tests/window/SlidingWindowTest.java | 1 + .../java/org/apache/storm/st/tests/window/TumblingWindowTest.java | 3 ++- .../src/test/java/org/apache/storm/st/wrapper/StormCluster.java | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
