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/03 23:09:20 UTC
[2/2] storm git commit: Merge branch 'STORM-2660'
Merge branch 'STORM-2660'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/aefc7252
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/aefc7252
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/aefc7252
Branch: refs/heads/master
Commit: aefc725201a037745fba7c95e1ac34ffb266207f
Parents: 758a1d2 96a0866
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Sep 4 08:09:13 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Sep 4 08:09:13 2017 +0900
----------------------------------------------------------------------
storm-client/src/jvm/org/apache/storm/Config.java | 6 ++++--
.../src/jvm/org/apache/storm/utils/ConfigUtils.java | 14 ++++++++++++++
.../org/apache/storm/blobstore/LocalFsBlobStore.java | 7 ++-----
.../scheduler/utils/ArtifactoryConfigLoader.java | 14 +++++---------
.../org/apache/storm/utils/ServerConfigUtils.java | 2 +-
5 files changed, 26 insertions(+), 17 deletions(-)
----------------------------------------------------------------------