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 2017/09/04 00:35:49 UTC
[2/2] storm git commit: Merge branch 'STORM-2660-1.x' into 1.x-branch
Merge branch 'STORM-2660-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/fd6185f8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fd6185f8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fd6185f8
Branch: refs/heads/1.x-branch
Commit: fd6185f8fdfd26bd96eb6869f7b0dcb265a9d674
Parents: c4a09d3 66612b3
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Sep 4 09:34:42 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Sep 4 09:34:42 2017 +0900
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/Config.java | 6 ++++--
.../apache/storm/blobstore/LocalFsBlobStore.java | 6 ++----
.../src/jvm/org/apache/storm/utils/ConfigUtils.java | 16 +++++++++++++++-
3 files changed, 21 insertions(+), 7 deletions(-)
----------------------------------------------------------------------