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 04:15:23 UTC

[4/5] storm git commit: Merge branch 'STORM-1700'

Merge branch 'STORM-1700'


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

Branch: refs/heads/master
Commit: 78f728a3d3c33f65c54eefd90f4911a044b030cb
Parents: ded5a0d 565d53d
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Jun 13 13:06:34 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Jun 13 13:06:34 2016 +0900

----------------------------------------------------------------------
 conf/storm.yaml.example                         |  11 ++
 .../org/apache/storm/daemon/StormCommon.java    |   9 +-
 .../storm/metric/MetricsConsumerBolt.java       |  85 +++++++++++++-
 .../storm/metric/filter/FilterByMetricName.java | 110 +++++++++++++++++++
 .../storm/metric/filter/MetricsFilter.java      |  26 +++++
 .../metric/filter/FilterByMetricNameTest.java   |  95 ++++++++++++++++
 6 files changed, 332 insertions(+), 4 deletions(-)
----------------------------------------------------------------------