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:38 UTC
[4/5] storm git commit: Merge branch 'STORM-1723-1.x-branch' into
1.x-branch
Merge branch 'STORM-1723-1.x-branch' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/adff0ea4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/adff0ea4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/adff0ea4
Branch: refs/heads/1.x-branch
Commit: adff0ea417874b36b14e20a93b3c53bae1f0e441
Parents: 38c7ff8 622b6d1
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Jun 13 13:48:48 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Jun 13 13:48:48 2016 +0900
----------------------------------------------------------------------
conf/defaults.yaml | 3 +
conf/storm.yaml.example | 9 +
log4j2/cluster.xml | 14 +
.../src/clj/org/apache/storm/daemon/nimbus.clj | 1544 +++++++++---------
storm-core/src/jvm/org/apache/storm/Config.java | 17 +-
.../metric/ClusterMetricsConsumerExecutor.java | 76 +
.../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, 1131 insertions(+), 742 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/adff0ea4/conf/defaults.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/adff0ea4/conf/storm.yaml.example
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/adff0ea4/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/adff0ea4/storm-core/src/jvm/org/apache/storm/Config.java
----------------------------------------------------------------------