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 2016/08/31 09:40:13 UTC
[6/6] storm git commit: Merge branch 'STORM-2039-1.x' into 1.x-branch
Merge branch 'STORM-2039-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/e806f3a0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e806f3a0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e806f3a0
Branch: refs/heads/1.x-branch
Commit: e806f3a0abf5b6010477f09f95cbf71f6053a8a9
Parents: 040706f e9fe288
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Aug 31 18:40:00 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Aug 31 18:40:00 2016 +0900
----------------------------------------------------------------------
conf/defaults.yaml | 1 +
.../clj/org/apache/storm/daemon/executor.clj | 15 ++++-------
.../src/clj/org/apache/storm/daemon/worker.clj | 26 +++++++++-----------
storm-core/src/jvm/org/apache/storm/Config.java | 7 ++++++
4 files changed, 24 insertions(+), 25 deletions(-)
----------------------------------------------------------------------