You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/11/03 00:21:11 UTC
[5/6] storm git commit: Merge branch 'STORM-2175' of
https://github.com/revans2/incubator-storm into STORM-2175
Merge branch 'STORM-2175' of https://github.com/revans2/incubator-storm into STORM-2175
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/af264600
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/af264600
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/af264600
Branch: refs/heads/master
Commit: af264600b6055844eb4b8aa9f9acd929d3a72fde
Parents: 0d5c8bf 3a389e9
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Nov 3 09:03:41 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Nov 3 09:03:41 2016 +0900
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/testing.clj | 5 +-
.../jvm/org/apache/storm/ProcessSimulator.java | 14 ++++-
.../src/jvm/org/apache/storm/StormTimer.java | 9 ++--
.../org/apache/storm/command/KillWorkers.java | 2 +-
.../daemon/supervisor/ReadClusterState.java | 55 +++++++++++++++-----
.../storm/daemon/supervisor/Supervisor.java | 4 +-
.../apache/storm/daemon/supervisor/UniFunc.java | 22 ++++++++
.../supervisor/timer/SupervisorHealthCheck.java | 2 +-
.../org/apache/storm/utils/DisruptorQueue.java | 10 ++--
9 files changed, 95 insertions(+), 28 deletions(-)
----------------------------------------------------------------------