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/02 17:40:08 UTC

[2/2] storm git commit: Merge branch 'STORM-3150' of https://github.com/zd-project/storm into STORM-3150-merge

Merge branch 'STORM-3150' of https://github.com/zd-project/storm into STORM-3150-merge


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

Branch: refs/heads/master
Commit: 5ef7c1d3580f7a6ede03ecab7ca1fa6e86e03ed7
Parents: 146beff 4d43947
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Thu Aug 2 19:38:44 2018 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Thu Aug 2 19:38:44 2018 +0200

----------------------------------------------------------------------
 .../org/apache/storm/daemon/nimbus/Nimbus.java  | 37 +++++++++--------
 .../storm/daemon/supervisor/Supervisor.java     | 13 +-----
 .../storm/metric/StormMetricsRegistry.java      | 42 +++++---------------
 .../metricstore/rocksdb/MetricsCleaner.java     |  9 +----
 .../org/apache/storm/pacemaker/Pacemaker.java   | 15 ++-----
 .../scheduler/blacklist/BlacklistScheduler.java | 10 +----
 6 files changed, 39 insertions(+), 87 deletions(-)
----------------------------------------------------------------------