storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kabh...@apache.org
Subject [6/7] storm git commit: Merge branch 'STORM-2175-1.x' of https://github.com/revans2/incubator-storm into STORM-2175-1.x
Date Thu, 03 Nov 2016 00:21:03 GMT
Merge branch 'STORM-2175-1.x' of https://github.com/revans2/incubator-storm into STORM-2175-1.x


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4fb52c83
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4fb52c83
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4fb52c83

Branch: refs/heads/1.x-branch
Commit: 4fb52c830b7b1cf0b619be64157f238edfc6cbf4
Parents: 1d7aeaa 9f981e5
Author: Jungtaek Lim <kabhwan@gmail.com>
Authored: Thu Nov 3 09:08:04 2016 +0900
Committer: Jungtaek Lim <kabhwan@gmail.com>
Committed: Thu Nov 3 09:08:04 2016 +0900

----------------------------------------------------------------------
 storm-core/src/clj/org/apache/storm/testing.clj |  5 +-
 storm-core/src/clj/org/apache/storm/timer.clj   | 10 +--
 .../jvm/org/apache/storm/ProcessSimulator.java  | 14 ++++-
 .../org/apache/storm/command/KillWorkers.java   |  4 +-
 .../daemon/supervisor/ReadClusterState.java     | 65 ++++++++++++++++----
 .../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, 105 insertions(+), 31 deletions(-)
----------------------------------------------------------------------



Mime
View raw message