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 2018/07/09 21:12:39 UTC
[4/4] storm git commit: Merge branch 'STORM-3125' of
https://github.com/zd-project/storm into STORM-3125-3126-3127-merge
Merge branch 'STORM-3125' of https://github.com/zd-project/storm into STORM-3125-3126-3127-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/daec2484
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/daec2484
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/daec2484
Branch: refs/heads/master
Commit: daec24841501c911b06fc10a5c98956e40fc1cd4
Parents: afe35f3 11383c2
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Jul 10 06:12:23 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Jul 10 06:12:23 2018 +0900
----------------------------------------------------------------------
.../daemon/drpc/BlockingOutstandingRequest.java | 3 +-
.../daemon/supervisor/ReadClusterState.java | 9 +-
.../apache/storm/daemon/supervisor/Slot.java | 306 +++++++++++--------
.../storm/daemon/supervisor/Supervisor.java | 3 +-
.../apache/storm/localizer/AsyncLocalizer.java | 4 +-
.../org/apache/storm/localizer/IOFunction.java | 22 ++
.../storm/localizer/LocalizedResource.java | 77 ++---
.../storm/localizer/LocallyCachedBlob.java | 115 ++++---
.../localizer/LocallyCachedTopologyBlob.java | 16 +-
.../java/org/apache/storm/utils/EnumUtil.java | 40 +++
.../storm/daemon/supervisor/SlotTest.java | 8 +-
.../storm/localizer/AsyncLocalizerTest.java | 40 ++-
12 files changed, 394 insertions(+), 249 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/daec2484/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
----------------------------------------------------------------------