You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@storm.apache.org by sr...@apache.org on 2019/01/30 11:41:28 UTC

[storm] 02/07: Merge branch 'STORM-3309' of https://github.com/srdo/storm into asfgit-master

This is an automated email from the ASF dual-hosted git repository.

srdo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git

commit df9fde4ae4fcea348c3823a1aa0a974ad18304be
Merge: 604ecf7 0c82b8f
Author: Stig Rohde Døssing <sr...@apache.org>
AuthorDate: Wed Jan 30 12:37:48 2019 +0100

    Merge branch 'STORM-3309' of https://github.com/srdo/storm into asfgit-master

 .../jvm/org/apache/storm/executor/Executor.java    |   6 +-
 .../apache/storm/executor/bolt/BoltExecutor.java   |   2 +-
 .../apache/storm/executor/spout/SpoutExecutor.java |   2 +-
 .../org/apache/storm/utils/InprocMessaging.java    |   2 +-
 .../src/jvm/org/apache/storm/utils/Utils.java      |   9 ++
 .../apache/storm/zookeeper/ClientZookeeper.java    |   2 +-
 storm-core/pom.xml                                 |   8 ++
 .../org/apache/storm/integration/TestingTest.java  |   8 +-
 .../storm/integration/TopologyIntegrationTest.java |   4 +-
 storm-server/pom.xml                               |   5 +
 .../main/java/org/apache/storm/LocalCluster.java   |   2 +
 .../test/java/org/apache/storm}/AssertLoop.java    |   6 +-
 .../test/java/org/apache/storm/TickTupleTest.java  | 141 +++++++++++++--------
 storm-server/src/test/resources/log4j2.xml         |  22 ++--
 14 files changed, 139 insertions(+), 80 deletions(-)