Merge branch 'STORM-2038-sym-link-alternative' of https://github.com/revans2/incubator-storm into STORM-2038-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/de47cebd Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/de47cebd Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/de47cebd Branch: refs/heads/master Commit: de47cebd42b3d76c5bc3012f96becde439e84fbb Parents: cf581cb b000a98 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Mon Mar 20 16:35:34 2017 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Mon Mar 20 16:35:34 2017 +0900 ---------------------------------------------------------------------- CHANGELOG.md | 4 ++ conf/defaults.yaml | 1 + docs/windows-users-guide.md | 9 ++++- storm-core/src/jvm/org/apache/storm/Config.java | 9 +++++ .../apache/storm/blobstore/BlobStoreUtils.java | 1 + .../storm/blobstore/BlobSynchronizer.java | 1 + .../org/apache/storm/daemon/nimbus/Nimbus.java | 13 ++++++- .../storm/daemon/supervisor/AdvancedFSOps.java | 14 +++++-- .../storm/daemon/supervisor/Container.java | 39 ++++++++++++-------- .../storm/daemon/supervisor/LocalContainer.java | 12 +++++- .../apache/storm/localizer/AsyncLocalizer.java | 30 ++++++++------- .../org/apache/storm/localizer/Localizer.java | 7 +++- 12 files changed, 103 insertions(+), 37 deletions(-) ----------------------------------------------------------------------
