Merge branch 'STORM-1629-1.x' 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/dc6608db Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dc6608db Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dc6608db Branch: refs/heads/1.x-branch Commit: dc6608dbc781f292909d17a739e1b9a8f0acda6d Parents: 885aaec 7b559ef Author: Jungtaek Lim <[email protected]> Authored: Sun Mar 20 10:56:36 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Sun Mar 20 10:56:36 2016 +0900 ---------------------------------------------------------------------- storm-core/src/clj/org/apache/storm/daemon/supervisor.clj | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
