You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/07/25 21:09:19 UTC
[02/16] storm git commit: Merge branch 'master' of
https://github.com/apache/storm into STORM-1876
Merge branch 'master' of https://github.com/apache/storm into STORM-1876
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/66f27355
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/66f27355
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/66f27355
Branch: refs/heads/master
Commit: 66f273557bef67e6e8cc2498d9d1b98d7e776a37
Parents: be877a0 f325feb
Author: Abhishek Agarwal <ab...@inmobi.com>
Authored: Wed Jun 15 19:37:08 2016 +0530
Committer: Abhishek Agarwal <ab...@inmobi.com>
Committed: Wed Jun 15 19:37:08 2016 +0530
----------------------------------------------------------------------
CHANGELOG.md | 707 +------------------
conf/defaults.yaml | 3 +
conf/storm.yaml.example | 20 +
docs/Command-line-client.md | 163 +++++
.../storm/starter/spout/TwitterSampleSpout.java | 12 +-
.../apache/storm/hdfs/spout/TextFileReader.java | 2 +-
.../apache/storm/hive/trident/HiveState.java | 8 +-
external/storm-kafka/README.md | 55 +-
.../storm/kafka/DynamicBrokersReader.java | 2 +-
.../kafka/DynamicPartitionConnections.java | 2 +-
.../ExponentialBackoffMsgRetryManager.java | 38 +-
.../storm/kafka/FailedMsgRetryManager.java | 60 +-
.../jvm/org/apache/storm/kafka/KafkaSpout.java | 2 +-
.../jvm/org/apache/storm/kafka/KafkaUtils.java | 2 +-
.../apache/storm/kafka/PartitionManager.java | 35 +-
.../jvm/org/apache/storm/kafka/SpoutConfig.java | 8 +-
.../org/apache/storm/kafka/ZkCoordinator.java | 2 +-
.../src/jvm/org/apache/storm/kafka/ZkState.java | 2 +-
.../kafka/trident/TridentKafkaEmitter.java | 2 +-
.../storm/kafka/trident/ZkBrokerReader.java | 2 +-
.../ExponentialBackoffMsgRetryManagerTest.java | 99 ++-
.../storm/redis/state/RedisKeyValueState.java | 6 +-
log4j2/cluster.xml | 14 +
.../src/clj/org/apache/storm/daemon/nimbus.clj | 192 +++--
storm-core/src/jvm/org/apache/storm/Config.java | 16 +
.../org/apache/storm/daemon/StormCommon.java | 9 +-
.../metric/ClusterMetricsConsumerExecutor.java | 70 ++
.../metric/LoggingClusterMetricsConsumer.java | 86 +++
.../storm/metric/MetricsConsumerBolt.java | 85 ++-
.../org/apache/storm/metric/api/DataPoint.java | 43 ++
.../metric/api/IClusterMetricsConsumer.java | 63 ++
.../storm/metric/api/IMetricsConsumer.java | 2 +
.../storm/metric/filter/FilterByMetricName.java | 110 +++
.../storm/metric/filter/MetricsFilter.java | 26 +
.../storm/validation/ConfigValidation.java | 16 +
.../metric/filter/FilterByMetricNameTest.java | 95 +++
36 files changed, 1210 insertions(+), 849 deletions(-)
----------------------------------------------------------------------