Merge branch 'STORM-2084' of https://github.com/revans2/incubator-storm into STORM-2084-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5c05bb74 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5c05bb74 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5c05bb74 Branch: refs/heads/master Commit: 5c05bb74cbef88dfd63ab212183c0494b9fcc985 Parents: 99969a5 78cb243 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Thu Sep 28 16:20:32 2017 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Thu Sep 28 16:20:32 2017 +0900 ---------------------------------------------------------------------- conf/defaults.yaml | 2 +- .../src/jvm/org/apache/storm/StormTimer.java | 2 +- .../org/apache/storm/testing4j_test.clj | 44 +- .../daemon/supervisor/ReadClusterState.java | 4 +- .../apache/storm/daemon/supervisor/Slot.java | 24 +- .../storm/daemon/supervisor/Supervisor.java | 53 +- .../daemon/supervisor/SupervisorUtils.java | 33 - .../daemon/supervisor/timer/UpdateBlobs.java | 111 -- .../org/apache/storm/event/EventManagerImp.java | 2 +- .../apache/storm/localizer/AsyncLocalizer.java | 1030 +++++++++++++++--- .../org/apache/storm/localizer/ILocalizer.java | 70 -- .../localizer/LocalDownloadedResource.java | 42 +- .../org/apache/storm/localizer/Localizer.java | 695 ------------ .../org/apache/storm/utils/ServerUtils.java | 18 +- .../storm/daemon/supervisor/SlotTest.java | 24 +- .../storm/localizer/AsyncLocalizerTest.java | 699 +++++++++++- .../apache/storm/localizer/LocalizerTest.java | 682 ------------ 17 files changed, 1627 insertions(+), 1908 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/5c05bb74/conf/defaults.yaml ----------------------------------------------------------------------
