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/03/15 21:01:38 UTC

[storm] 06/06: Merge branch 'STORM-3355' 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 68d2f49e2bfd984b9d015bc7f40ae600a0031ca1
Merge: 65ce33c 60199bd
Author: Stig Rohde Døssing <sr...@apache.org>
AuthorDate: Fri Mar 15 22:00:58 2019 +0100

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

 conf/defaults.yaml                                                 | 2 +-
 storm-client/src/jvm/org/apache/storm/Config.java                  | 7 +++++++
 storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java    | 4 +++-
 storm-client/src/jvm/org/apache/storm/task/IBolt.java              | 6 ++++--
 storm-server/src/main/java/org/apache/storm/DaemonConfig.java      | 7 -------
 .../src/main/java/org/apache/storm/daemon/supervisor/Slot.java     | 2 +-
 .../main/java/org/apache/storm/daemon/supervisor/Supervisor.java   | 2 +-
 7 files changed, 17 insertions(+), 13 deletions(-)