Merge branch 'STORM-2090-1.x' into 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/13ae2aea
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/13ae2aea
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/13ae2aea

Branch: refs/heads/1.x-branch
Commit: 13ae2aeacad49089ce5c30c39236d80090b34de8
Parents: 65c7acd 6c9836d
Author: Jungtaek Lim <kabh...@gmail.com>
Authored: Fri Sep 23 10:33:31 2016 +0900
Committer: Jungtaek Lim <kabh...@gmail.com>
Committed: Fri Sep 23 10:33:31 2016 +0900

----------------------------------------------------------------------
 .gitignore                                      |   3 +
 .travis.yml                                     |   8 +-
 integration-test/README.md                      |  59 +++
 integration-test/config/Vagrantfile             | 183 +++++++++
 integration-test/config/cluster.xml             |  96 +++++
 integration-test/config/common.sh               |  21 ++
 integration-test/config/etc-hosts               |  18 +
 integration-test/config/install-storm.sh        |  39 ++
 integration-test/config/install-zookeeper.sh    |  20 +
 integration-test/config/storm.yaml              |  33 ++
 integration-test/pom.xml                        | 250 ++++++++++++
 integration-test/run-it.sh                      |  83 ++++
 .../org/apache/storm/ExclamationTopology.java   |  93 +++++
 .../org/apache/storm/debug/DebugHelper.java     |  39 ++
 .../storm/st/topology/TestableTopology.java     |  30 ++
 .../topology/window/SlidingTimeCorrectness.java | 170 +++++++++
 .../window/SlidingWindowCorrectness.java        | 157 ++++++++
 .../window/TumblingTimeCorrectness.java         | 167 ++++++++
 .../window/TumblingWindowCorrectness.java       | 154 ++++++++
 .../storm/st/topology/window/data/FromJson.java |  22 ++
 .../storm/st/topology/window/data/TimeData.java | 110 ++++++
 .../st/topology/window/data/TimeDataWindow.java |  91 +++++
 .../apache/storm/st/utils/StringDecorator.java  |  37 ++
 .../org/apache/storm/st/utils/TimeUtil.java     |  54 +++
 .../test/java/org/apache/storm/st/DemoTest.java |  85 +++++
 .../apache/storm/st/helper/AbstractTest.java    |  27 ++
 .../apache/storm/st/meta/TestngListener.java    |  97 +++++
 .../st/tests/window/SlidingWindowTest.java      | 187 +++++++++
 .../st/tests/window/TumblingWindowTest.java     |  99 +++++
 .../org/apache/storm/st/utils/AssertUtil.java   |  71 ++++
 .../org/apache/storm/st/wrapper/LogData.java    |  66 ++++
 .../apache/storm/st/wrapper/StormCluster.java   | 118 ++++++
 .../org/apache/storm/st/wrapper/TopoWrap.java   | 378 +++++++++++++++++++
 .../src/test/resources/storm-conf/storm.yaml    |  33 ++
 pom.xml                                         |   3 +
 35 files changed, 3099 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


Reply via email to