[2/2] storm git commit: Merge branch 'STORM-2811' of https://github.com/srdo/storm into asfgit-master

[srdo]

Merge branch 'STORM-2811' 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/2709a1cd
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2709a1cd
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2709a1cd

Branch: refs/heads/master
Commit: 2709a1cda9bd1bcc5982bd73243bbe2a5fd0112c
Parents: 32fefef d568408
Author: Stig Rohde Døssing <s...@apache.org>
Authored: Mon Nov 13 19:26:09 2017 +0100
Committer: Stig Rohde Døssing <s...@apache.org>
Committed: Mon Nov 13 19:26:09 2017 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/storm/st/utils/StringDecorator.java | 1 -
 integration-test/src/test/java/org/apache/storm/st/DemoTest.java | 1 +
 .../java/org/apache/storm/st/tests/window/SlidingWindowTest.java | 1 +
 .../org/apache/storm/st/tests/window/TumblingWindowTest.java     | 3 ++-
 .../src/test/java/org/apache/storm/st/wrapper/StormCluster.java  | 2 +-
 .../src/jvm/org/apache/storm/cluster/IStormClusterState.java     | 4 ++--
 6 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------