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/04/14 06:28:30 UTC
[3/4] storm git commit: Merge branch 'STORM-832' of
https://github.com/revans2/incubator-storm into STORM-832-merge
Merge branch 'STORM-832' of https://github.com/revans2/incubator-storm into STORM-832-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/67c99bf7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/67c99bf7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/67c99bf7
Branch: refs/heads/master
Commit: 67c99bf7fcda65181b60c5f5e145b233ca4fe6eb
Parents: 0e72a74 aec187f
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Apr 14 15:27:42 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Apr 14 15:27:42 2017 +0900
----------------------------------------------------------------------
docs/Configuration.md | 12 +-
.../org/apache/storm/hdfs/spout/Configs.java | 129 ++++++++--
.../org/apache/storm/hdfs/spout/HdfsSpout.java | 9 +-
.../org.apache.storm.validation.Validated | 17 ++
.../apache/storm/hdfs/spout/ConfigsTest.java | 88 +++++++
.../storm/validation/ConfigValidation.java | 245 ++++++++++++-------
.../validation/ConfigValidationAnnotations.java | 54 ++--
.../org/apache/storm/validation/NotConf.java | 27 ++
.../org/apache/storm/validation/Validated.java | 25 ++
.../org/apache/storm/TestConfigValidate.java | 32 +--
.../src/clj/org/apache/storm/config.clj | 14 +-
storm-core/src/clj/org/apache/storm/config.clj | 21 +-
storm-core/src/clj/org/apache/storm/ui/core.clj | 22 +-
.../org/apache/storm/command/AdminCommands.java | 17 +-
.../org/apache/storm/command/ConfigValue.java | 4 +-
.../org/apache/storm/command/DevZookeeper.java | 9 +-
.../org/apache/storm/command/HealthCheck.java | 8 +-
.../org/apache/storm/command/Heartbeats.java | 8 +-
.../org/apache/storm/command/KillWorkers.java | 4 +-
.../apache/storm/security/auth/auth_test.clj | 6 +-
.../storm/security/auth/nimbus_auth_test.clj | 8 +-
storm-server/pom.xml | 2 +-
.../java/org/apache/storm/DaemonConfig.java | 3 +-
.../java/org/apache/storm/LocalCluster.java | 4 +-
.../main/java/org/apache/storm/LocalDRPC.java | 4 +-
.../storm/blobstore/FileBlobStoreImpl.java | 3 +-
.../storm/blobstore/LocalFsBlobStore.java | 3 +-
.../org/apache/storm/daemon/nimbus/Nimbus.java | 10 +-
.../org/apache/storm/pacemaker/Pacemaker.java | 27 +-
.../apache/storm/utils/ServerConfigUtils.java | 43 ++--
.../org/apache/storm/utils/ServerUtils.java | 3 +-
.../org.apache.storm.validation.Validated | 17 ++
.../apache/storm/TestDaemonConfigValidate.java | 12 +-
.../apache/storm/daemon/drpc/DRPCServer.java | 5 +-
34 files changed, 618 insertions(+), 277 deletions(-)
----------------------------------------------------------------------