Merge branch 'STORM-2038-sym-link-alternative-1.0.x' of 
https://github.com/revans2/incubator-storm into STORM-2038-1.0.x-merge


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

Branch: refs/heads/1.0.x-branch
Commit: 5b14b49483e37a9f924551eb1df97faf47d3a2a8
Parents: 190a1df 2aa178d
Author: Jungtaek Lim <kabh...@gmail.com>
Authored: Mon Mar 20 16:36:35 2017 +0900
Committer: Jungtaek Lim <kabh...@gmail.com>
Committed: Mon Mar 20 16:36:35 2017 +0900

----------------------------------------------------------------------
 CHANGELOG.md                                    |  1 +
 conf/defaults.yaml                              |  1 +
 docs/windows-users-guide.md                     |  9 ++++-
 .../src/clj/org/apache/storm/daemon/nimbus.clj  |  9 ++++-
 storm-core/src/jvm/org/apache/storm/Config.java |  9 +++++
 .../storm/daemon/supervisor/AdvancedFSOps.java  | 16 ++++++--
 .../storm/daemon/supervisor/Container.java      | 41 +++++++++++++-------
 .../storm/daemon/supervisor/LocalContainer.java | 12 +++++-
 .../apache/storm/localizer/AsyncLocalizer.java  | 32 ++++++++-------
 .../org/apache/storm/localizer/Localizer.java   |  8 +++-
 .../src/jvm/org/apache/storm/utils/Utils.java   | 10 +++++
 11 files changed, 111 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


Reply via email to