Merge branch 'STORM-1532-1.x' of github.com:arunmahadevan/storm into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/29bdf573 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/29bdf573 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/29bdf573 Branch: refs/heads/1.x-branch Commit: 29bdf5737f33b72fa68063c0f7032e01c0c013a9 Parents: 69cf90d b2f8c1b Author: P. Taylor Goetz <[email protected]> Authored: Fri Feb 19 15:09:09 2016 -0500 Committer: P. Taylor Goetz <[email protected]> Committed: Fri Feb 19 15:09:09 2016 -0500 ---------------------------------------------------------------------- bin/storm-config.cmd | 4 ++++ bin/storm.cmd | 2 +- storm-core/src/jvm/org/apache/storm/utils/Utils.java | 12 +++++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
