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 2016/06/13 05:01:31 UTC
[2/3] storm git commit: Merge branch 'STORM-1723'
Merge branch 'STORM-1723'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b738dcdb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b738dcdb
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b738dcdb
Branch: refs/heads/master
Commit: b738dcdbda95328cd8904529c9d3dbf1934a698d
Parents: d42276f 1362c0b
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Jun 13 13:24:07 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Jun 13 13:24:07 2016 +0900
----------------------------------------------------------------------
conf/defaults.yaml | 3 +
conf/storm.yaml.example | 9 +
log4j2/cluster.xml | 14 ++
.../src/clj/org/apache/storm/daemon/nimbus.clj | 192 ++++++++++++-------
storm-core/src/jvm/org/apache/storm/Config.java | 16 ++
.../metric/ClusterMetricsConsumerExecutor.java | 70 +++++++
.../metric/LoggingClusterMetricsConsumer.java | 86 +++++++++
.../org/apache/storm/metric/api/DataPoint.java | 43 +++++
.../metric/api/IClusterMetricsConsumer.java | 63 ++++++
.../storm/metric/api/IMetricsConsumer.java | 2 +
.../storm/validation/ConfigValidation.java | 16 ++
11 files changed, 449 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b738dcdb/conf/storm.yaml.example
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b738dcdb/storm-core/src/jvm/org/apache/storm/Config.java
----------------------------------------------------------------------