You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2015/08/13 18:19:04 UTC

[4/5] storm git commit: Merge branch '964' of https://github.com/zhuoliu/storm

Merge branch '964' of https://github.com/zhuoliu/storm


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b84981ec
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b84981ec
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b84981ec

Branch: refs/heads/master
Commit: b84981ec98af8aac0f361fe886f903380171e619
Parents: 9e80903 eb6d738
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Thu Aug 13 11:16:41 2015 -0500
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Thu Aug 13 11:16:41 2015 -0500

----------------------------------------------------------------------
 conf/defaults.yaml                                      | 1 +
 storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 2 ++
 storm-core/src/jvm/backtype/storm/Config.java           | 6 ++++++
 3 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/b84981ec/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------