Merge branch 'local-hostname-conf' of https://github.com/yieldbot/storm into STORM-546-V1
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cc9b24ec Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cc9b24ec Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cc9b24ec Branch: refs/heads/master Commit: cc9b24ec3634af707147f5205f8e2066e8300cd8 Parents: e15dbe2 b782852 Author: Sriharsha Chintalapani <[email protected]> Authored: Wed Nov 12 08:43:34 2014 -0800 Committer: Sriharsha Chintalapani <[email protected]> Committed: Wed Nov 12 08:43:34 2014 -0800 ---------------------------------------------------------------------- storm-core/src/clj/backtype/storm/daemon/executor.clj | 5 +++-- storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 4 +--- storm-core/src/clj/backtype/storm/util.clj | 6 ++++++ 3 files changed, 10 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
