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 2018/08/14 14:25:00 UTC

[5/5] storm git commit: Merge branch 'STORM-3184-master' of https://github.com/arunmahadevan/storm into STORM-3184-master

Merge branch 'STORM-3184-master' of https://github.com/arunmahadevan/storm into STORM-3184-master


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4c42ee3d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4c42ee3d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4c42ee3d

Branch: refs/heads/master
Commit: 4c42ee3d259d5d90a4e7d3445d1c119601eec6c7
Parents: c2931da c12ddb3
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Aug 14 23:24:04 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Aug 14 23:24:04 2018 +0900

----------------------------------------------------------------------
 .../AbstractHadoopNimbusPluginAutoCreds.java    |  4 ++-
 .../src/jvm/org/apache/storm/Config.java        |  2 ++
 .../org/apache/storm/daemon/worker/Worker.java  |  4 +--
 .../jvm/org/apache/storm/utils/ConfigUtils.java | 37 ++++++++++++++++++++
 .../storm/validation/ConfigValidation.java      |  2 +-
 .../validation/ConfigValidationAnnotations.java |  6 ++++
 .../java/org/apache/storm/DaemonConfig.java     | 10 ++++++
 .../org/apache/storm/daemon/nimbus/Nimbus.java  |  5 ++-
 .../storm/daemon/supervisor/Supervisor.java     |  2 +-
 .../java/org/apache/storm/DaemonConfigTest.java | 12 +++++++
 10 files changed, 76 insertions(+), 8 deletions(-)
----------------------------------------------------------------------