You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/03/11 21:10:16 UTC
[5/6] storm git commit: Merge branch 'storm-657' of
https://github.com/caofangkun/apache-storm into STORM-657
Merge branch 'storm-657' of https://github.com/caofangkun/apache-storm into STORM-657
STORM-657:make the shutdown-worker sleep time before kill -9 configurable
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c8ac509b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c8ac509b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c8ac509b
Branch: refs/heads/master
Commit: c8ac509b026668f672e185b9f91ca11ce78881a8
Parents: bbc052e 1d9b283
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Mar 11 15:01:57 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Mar 11 15:01:57 2015 -0500
----------------------------------------------------------------------
conf/defaults.yaml | 2 ++
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 5 ++++-
storm-core/src/jvm/backtype/storm/Config.java | 6 ++++++
3 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c8ac509b/conf/defaults.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c8ac509b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------