This is an automated email from the ASF dual-hosted git repository.
kabhwan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git.
from 1c94048 Merge branch 'STORM-3386' of https://github.com/srdo/storm
into asfgit-master
add 74d4bc2 STORM-3370: Make StormMetricRegistry non-static, and supply
it as a dependendency where it is used
new 48fb1e4 Merge branch 'STORM-3370' of https://github.com/srdo/storm
into STORM-3370-merge
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/storm/perf/JCQueuePerfTest.java | 25 +++++---
.../hdfs/bolt/format/TestSimpleFileNameFormat.java | 2 +-
.../org/apache/storm/hdfs/spout/TestHdfsSpout.java | 7 +--
.../src/jvm/org/apache/storm/daemon/Task.java | 34 +++++------
.../jvm/org/apache/storm/daemon/worker/Worker.java | 9 +--
.../apache/storm/daemon/worker/WorkerState.java | 15 ++++-
.../apache/storm/daemon/worker/WorkerTransfer.java | 9 +--
.../apache/storm/metrics2/StormMetricRegistry.java | 66 ++++++++++------------
.../jvm/org/apache/storm/metrics2/TaskMetrics.java | 28 ++++-----
.../jvm/org/apache/storm/task/TopologyContext.java | 31 +++++-----
.../src/jvm/org/apache/storm/utils/JCQueue.java | 4 +-
.../storm/utils/JCQueueBackpressureTest.java | 3 +-
.../jvm/org/apache/storm/utils/JCQueueTest.java | 3 +-
.../src/main/java/org/apache/storm/Testing.java | 33 +++++------
14 files changed, 142 insertions(+), 127 deletions(-)
