Merge branch 'STORM-2038-sym-link-alternative-1.x' of https://github.com/revans2/incubator-storm into STORM-2038-1.x-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/466a5d0d Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/466a5d0d Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/466a5d0d Branch: refs/heads/1.x-branch Commit: 466a5d0d720376397919a060f8a8e0a43f37cfc1 Parents: e0b1333 f9bfb21 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Mon Mar 20 16:44:27 2017 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Mon Mar 20 16:44:27 2017 +0900 ---------------------------------------------------------------------- conf/defaults.yaml | 1 + docs/windows-users-guide.md | 9 ++++- .../src/clj/org/apache/storm/daemon/nimbus.clj | 7 +++- storm-core/src/jvm/org/apache/storm/Config.java | 9 +++++ .../storm/daemon/supervisor/AdvancedFSOps.java | 16 ++++++-- .../storm/daemon/supervisor/Container.java | 41 +++++++++++++------- .../apache/storm/localizer/AsyncLocalizer.java | 32 ++++++++------- .../org/apache/storm/localizer/Localizer.java | 8 +++- .../src/jvm/org/apache/storm/utils/Utils.java | 10 +++++ 9 files changed, 97 insertions(+), 36 deletions(-) ----------------------------------------------------------------------
