Merge branch 'STORM-2807' of https://github.com/srdo/storm into asfgit-master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2657c25f Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2657c25f Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2657c25f Branch: refs/heads/master Commit: 2657c25f232f9cf6f7d6580cd27c2d76a7b6c4c9 Parents: ee1be2b 3cb5239 Author: Stig Rohde Døssing <[email protected]> Authored: Sat Nov 11 10:47:41 2017 +0100 Committer: Stig Rohde Døssing <[email protected]> Committed: Sat Nov 11 10:47:41 2017 +0100 ---------------------------------------------------------------------- integration-test/README.md | 2 +- .../window/TumblingTimeCorrectness.java | 6 ++--- .../window/TumblingWindowCorrectness.java | 2 +- .../test/java/org/apache/storm/st/DemoTest.java | 2 +- .../st/tests/window/SlidingWindowTest.java | 6 ++--- .../st/tests/window/TumblingWindowTest.java | 6 ++--- .../apache/storm/st/wrapper/StormCluster.java | 25 +++++++++++++------- .../org/apache/storm/st/wrapper/TopoWrap.java | 6 ++--- 8 files changed, 32 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
