You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2018/02/01 14:36:06 UTC
[3/3] storm git commit: Merge branch 'storm2873-1.x-branch' of
https://github.com/kishorvpatil/incubator-storm into STORM-2873-1.x-merge
Merge branch 'storm2873-1.x-branch' of https://github.com/kishorvpatil/incubator-storm into STORM-2873-1.x-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/33f543cf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/33f543cf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/33f543cf
Branch: refs/heads/1.x-branch
Commit: 33f543cf6211f8109d968bb27fecd40ae1f3a9d9
Parents: 49c2fc3 14cb3a9
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Feb 1 23:35:54 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Feb 1 23:35:54 2018 +0900
----------------------------------------------------------------------
conf/defaults.yaml | 2 +
storm-core/src/clj/org/apache/storm/cluster.clj | 63 ++++++++++++++----
.../src/clj/org/apache/storm/daemon/worker.clj | 68 ++++++++++++--------
storm-core/src/jvm/org/apache/storm/Config.java | 17 +++++
.../test/clj/org/apache/storm/cluster_test.clj | 15 +++++
5 files changed, 123 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/33f543cf/conf/defaults.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/33f543cf/storm-core/src/clj/org/apache/storm/daemon/worker.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/33f543cf/storm-core/src/jvm/org/apache/storm/Config.java
----------------------------------------------------------------------