Merge branch 'STORM-248'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/49553518 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/49553518 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/49553518 Branch: refs/heads/master Commit: 49553518d9d4a2265776d253c70e4be0d43cbac7 Parents: 274317e 5894634 Author: Sriharsha Chintalapani <[email protected]> Authored: Fri Jan 16 08:41:36 2015 -0800 Committer: Sriharsha Chintalapani <[email protected]> Committed: Fri Jan 16 08:41:36 2015 -0800 ---------------------------------------------------------------------- CHANGELOG.md | 2 ++ bin/storm | 21 ++++++++----- bin/storm-config.cmd | 32 ++++++++++++++++++-- bin/storm.cmd | 12 ++++---- .../clj/backtype/storm/daemon/supervisor.clj | 5 ++- 5 files changed, 56 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
