Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7e43a2b1 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7e43a2b1 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7e43a2b1 Branch: refs/heads/0.10.x-branch Commit: 7e43a2b16f373a25df1e0e86e5a01266ebc69085 Parents: 70ce03c bf2ef23 Author: P. Taylor Goetz <[email protected]> Authored: Thu Jun 4 16:03:43 2015 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Thu Jun 4 16:03:43 2015 -0400 ---------------------------------------------------------------------- CHANGELOG.md | 1 + storm-core/src/clj/backtype/storm/config.clj | 2 +- .../src/clj/backtype/storm/daemon/nimbus.clj | 10 ++++---- .../src/jvm/backtype/storm/utils/Utils.java | 26 ++++++++++++++++++++ 4 files changed, 33 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
