Merge branch 'Storm-1667-1.x-branch' of https://github.com/zhuoliu/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/de719aa1 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/de719aa1 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/de719aa1 Branch: refs/heads/1.x-branch Commit: de719aa19d0808690751edade4d7907c96ab723a Parents: 11f2315 b3b934a Author: Kyle Nusbaum <[email protected]> Authored: Fri Apr 1 10:10:28 2016 -0500 Committer: Kyle Nusbaum <[email protected]> Committed: Fri Apr 1 10:10:28 2016 -0500 ---------------------------------------------------------------------- .../src/clj/org/apache/storm/daemon/supervisor.clj | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
