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 2017/05/21 11:42:59 UTC

[2/3] storm git commit: Merge branch 'STORM-2413' of https://github.com/srdo/storm into STORM-2413-merge

Merge branch 'STORM-2413' of https://github.com/srdo/storm into STORM-2413-merge


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

Branch: refs/heads/master
Commit: 07ca978c78846c9159d4e132d46c62465e82ec84
Parents: ca12db9 20a8260
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sun May 21 20:18:45 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sun May 21 20:18:45 2017 +0900

----------------------------------------------------------------------
 .../apache/storm/kafka/spout/KafkaSpout.java    |  2 +-
 .../storm/kafka/spout/KafkaSpoutMessageId.java  |  4 +--
 .../KafkaSpoutRetryExponentialBackoff.java      | 14 +++++++++
 .../kafka/spout/KafkaSpoutRetryService.java     | 13 +++++++-
 .../kafka/spout/KafkaSpoutRebalanceTest.java    | 13 ++++++--
 .../kafka/spout/SingleTopicKafkaSpoutTest.java  | 32 +++++++++++++++++---
 .../test/KafkaSpoutTopologyMainNamedTopics.java |  1 -
 .../src/test/resources/log4j2.xml               | 32 ++++++++++++++++++++
 8 files changed, 100 insertions(+), 11 deletions(-)
----------------------------------------------------------------------