You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2018/08/06 16:10:49 UTC
[2/2] storm git commit: Merge branch 'STORM-3157' of
https://github.com/zd-project/storm into STORM-3157-merge
Merge branch 'STORM-3157' of https://github.com/zd-project/storm into STORM-3157-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/73382d9e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/73382d9e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/73382d9e
Branch: refs/heads/master
Commit: 73382d9ecee7dc193070ec136b34ea9ac568b20d
Parents: 4bc28e7 88ba5f6
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Mon Aug 6 18:06:40 2018 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Mon Aug 6 18:06:40 2018 +0200
----------------------------------------------------------------------
.../storm/metric/StormMetricsRegistry.java | 57 +++++++++++++-------
.../org/apache/storm/pacemaker/Pacemaker.java | 4 +-
2 files changed, 40 insertions(+), 21 deletions(-)
----------------------------------------------------------------------