You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2017/08/30 21:07:29 UTC
[06/50] [abbrv] storm git commit: Merge branch 'STORM-2542-1.x' of
https://github.com/srdo/storm into STORM-2640-1.x-merge
Merge branch 'STORM-2542-1.x' of https://github.com/srdo/storm into STORM-2640-1.x-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0d64247a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0d64247a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0d64247a
Branch: refs/heads/metrics_v2
Commit: 0d64247a56c99321c7398a5942e0389579e48224
Parents: d128cd9 2ebf226
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Thu Jul 27 00:28:20 2017 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Thu Jul 27 00:28:20 2017 +0200
----------------------------------------------------------------------
docs/storm-kafka-client.md | 7 +-
.../storm/kafka/spout/KafkaSpoutConfig.java | 29 +++----
.../spout/ManualPartitionSubscription.java | 1 +
.../storm/kafka/spout/ManualPartitioner.java | 1 +
.../storm/kafka/spout/NamedSubscription.java | 4 +-
.../storm/kafka/spout/PatternSubscription.java | 4 +-
.../storm/kafka/spout/KafkaSpoutCommitTest.java | 41 +++------
.../storm/kafka/spout/KafkaSpoutEmitTest.java | 53 ++++--------
.../kafka/spout/KafkaSpoutRebalanceTest.java | 37 +++++----
.../kafka/spout/KafkaSpoutRetryLimitTest.java | 79 +++++++-----------
.../kafka/spout/MaxUncommittedOffsetTest.java | 7 +-
.../storm/kafka/spout/NamedTopicFilterTest.java | 3 +-
.../kafka/spout/PatternTopicFilterTest.java | 2 +
.../kafka/spout/SingleTopicKafkaSpoutTest.java | 10 ++-
.../SpoutWithMockedConsumerSetupHelper.java | 87 ++++++++++++++++++++
.../SingleTopicKafkaSpoutConfiguration.java | 46 +++++++----
16 files changed, 238 insertions(+), 173 deletions(-)
----------------------------------------------------------------------