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 2016/12/29 00:29:49 UTC
[3/4] storm git commit: Merge branch 'STORM-2104-1.x' of
https://github.com/srdo/storm into STORM-2104-1.x-merge
Merge branch 'STORM-2104-1.x' of https://github.com/srdo/storm into STORM-2104-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/2e939d2c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2e939d2c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2e939d2c
Branch: refs/heads/1.x-branch
Commit: 2e939d2ca84ee34df81aa508bda2f6f09696aa40
Parents: bbc8b64 3e225b4
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Dec 29 08:07:11 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Dec 29 08:07:11 2016 +0900
----------------------------------------------------------------------
external/storm-kafka-client/pom.xml | 10 +-
.../apache/storm/kafka/spout/KafkaSpout.java | 54 ++++--
.../storm/kafka/spout/KafkaSpoutConfig.java | 8 +-
.../kafka/spout/SerializableDeserializer.java | 25 +++
.../spout/internal/KafkaConsumerFactory.java | 27 +++
.../internal/KafkaConsumerFactoryDefault.java | 29 +++
.../kafka/spout/KafkaSpoutRebalanceTest.java | 180 +++++++++++++++++++
.../SingleTopicKafkaSpoutConfiguration.java | 35 ++--
8 files changed, 337 insertions(+), 31 deletions(-)
----------------------------------------------------------------------