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:42 UTC

[2/2] storm git commit: Merge branch 'STORM-2660-1.1.x' into 1.1.x-branch

Merge branch 'STORM-2660-1.1.x' into 1.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/bd830c3c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bd830c3c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bd830c3c

Branch: refs/heads/1.1.x-branch
Commit: bd830c3cbffabbe1388cc2fa01d27b992f48b167
Parents: e3020a3 d25b525
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Sep 4 09:35:12 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Sep 4 09:35:12 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(-)
----------------------------------------------------------------------