Merge branch 'STORM-2548-1.x' of https://github.com/srdo/storm into STORM-2548-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/f7c3a6f0 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f7c3a6f0 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f7c3a6f0 Branch: refs/heads/1.x-branch Commit: f7c3a6f092e74ab1ac7382f4f06fb1f9f5d77586 Parents: 5e15099 05e9268 Author: Stig Rohde Døssing <s...@apache.org> Authored: Tue Jul 18 18:44:38 2017 +0200 Committer: Stig Rohde Døssing <s...@apache.org> Committed: Tue Jul 18 18:44:38 2017 +0200 ---------------------------------------------------------------------- docs/storm-kafka-client.md | 140 +++-- .../TridentKafkaClientWordCountNamedTopics.java | 27 +- ...identKafkaClientWordCountWildcardTopics.java | 5 +- .../storm/kafka/spout/KafkaSpoutConfig.java | 521 ++++++++++++------- .../kafka/spout/SerializableDeserializer.java | 6 +- .../internal/KafkaConsumerFactoryDefault.java | 3 +- .../spout/trident/KafkaTridentSpoutManager.java | 3 +- .../storm/kafka/spout/KafkaSpoutConfigTest.java | 17 +- .../kafka/spout/MaxUncommittedOffsetTest.java | 3 +- .../SingleTopicKafkaSpoutConfiguration.java | 6 +- .../test/KafkaSpoutTopologyMainNamedTopics.java | 4 +- .../KafkaSpoutTopologyMainWildcardTopics.java | 4 +- 12 files changed, 448 insertions(+), 291 deletions(-) ----------------------------------------------------------------------
