You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/09/10 17:33:37 UTC
[2/2] storm git commit: Merge branch 'storm2832' of
https://github.com/milantracy/storm into STORM-2832
Merge branch 'storm2832' of https://github.com/milantracy/storm into STORM-2832
STORM-2832: misuse of Utils.readStormConfig() and ConfigUtils.readSto
This closes #2822
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/60634d32
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/60634d32
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/60634d32
Branch: refs/heads/master
Commit: 60634d32acb89482c9524f7ab5a029dc5b8b1163
Parents: e6ff071 0ab866c
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Mon Sep 10 12:08:44 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Mon Sep 10 12:08:44 2018 -0500
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/daemon/worker/Worker.java | 2 +-
storm-core/src/jvm/org/apache/storm/command/DevZookeeper.java | 3 ++-
storm-server/src/main/java/org/apache/storm/LocalDRPC.java | 4 ++--
.../src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 2 +-
.../java/org/apache/storm/daemon/supervisor/Supervisor.java | 2 +-
.../src/main/java/org/apache/storm/pacemaker/Pacemaker.java | 3 +--
.../main/java/org/apache/storm/zookeeper/AclEnforcement.java | 3 ++-
.../src/main/java/org/apache/storm/daemon/drpc/DRPCServer.java | 3 ++-
.../src/main/java/org/apache/storm/daemon/ui/UIServer.java | 6 ++----
.../org/apache/storm/daemon/ui/resources/StormApiResource.java | 4 ++--
10 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------