Merge branch 'STORM-1629'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/36ed8ef1 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/36ed8ef1 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/36ed8ef1 Branch: refs/heads/master Commit: 36ed8ef1a968ede5e9c60395c13381ef796e7a6a Parents: 367464a 02f9308 Author: Jungtaek Lim <[email protected]> Authored: Sun Mar 20 10:36:58 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Sun Mar 20 10:36:58 2016 +0900 ---------------------------------------------------------------------- storm-core/src/clj/org/apache/storm/daemon/supervisor.clj | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
