You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/12/14 16:29:39 UTC
[4/5] storm git commit: Merge branch '1387' of
https://github.com/zhuoliu/storm into STORM-1387
Merge branch '1387' of https://github.com/zhuoliu/storm into STORM-1387
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5afb4baf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5afb4baf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5afb4baf
Branch: refs/heads/master
Commit: 5afb4bafc631593c0a4e8488f5e6cbfd4a34c035
Parents: 6d7b968 c420b2b
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Mon Dec 14 07:13:04 2015 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Mon Dec 14 07:13:04 2015 -0800
----------------------------------------------------------------------
conf/defaults.yaml | 1 +
storm-core/src/clj/backtype/storm/config.clj | 7 ++++++-
storm-core/src/clj/backtype/storm/util.clj | 1 -
storm-core/src/jvm/backtype/storm/Config.java | 8 ++++++++
storm-core/test/clj/backtype/storm/supervisor_test.clj | 2 ++
5 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5afb4baf/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------