You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2017/09/18 13:58:50 UTC

[2/2] storm git commit: Merge branch 'STORM-2741' of https://github.com/Ethanlm/storm into STORM-2741

Merge branch 'STORM-2741' of https://github.com/Ethanlm/storm into STORM-2741

STORM-2741: Add in config options for metrics consumer cpu and memory

This closes #2326


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

Branch: refs/heads/master
Commit: 05a74c73db9b9017d3672d3cc055e8f1ada1d69e
Parents: 124acb9 4a29b57
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Mon Sep 18 08:41:13 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Mon Sep 18 08:41:13 2017 -0500

----------------------------------------------------------------------
 .../src/jvm/org/apache/storm/Config.java        | 22 ++++++++++++++++++++
 .../src/jvm/org/apache/storm/Constants.java     |  2 +-
 .../org/apache/storm/daemon/StormCommon.java    |  1 +
 .../apache/storm/scheduler/TopologyDetails.java | 14 +++++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)
----------------------------------------------------------------------