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 2019/05/05 09:04:52 UTC
[storm] branch master updated (1c94048 -> 48fb1e4)
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(-)
[storm] 01/01: Merge branch 'STORM-3370' of
https://github.com/srdo/storm into STORM-3370-merge
Posted by ka...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kabhwan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
commit 48fb1e4af7a21fc15c5381f4c367435e7f181df8
Merge: 1c94048 74d4bc2
Author: Jungtaek Lim (HeartSaVioR) <ka...@gmail.com>
AuthorDate: Sun May 5 18:04:30 2019 +0900
Merge branch 'STORM-3370' of https://github.com/srdo/storm into STORM-3370-merge
.../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(-)