Merge branch 'STORM-2548' of https://github.com/srdo/storm into STORM-2548-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/782c4bf7 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/782c4bf7 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/782c4bf7 Branch: refs/heads/master Commit: 782c4bf7debb2475e41e6771ef6088ebb1a2d9a9 Parents: a8946ad 01a56ec Author: Stig Rohde Døssing <s...@apache.org> Authored: Tue Jul 18 18:37:34 2017 +0200 Committer: Stig Rohde Døssing <s...@apache.org> Committed: Tue Jul 18 18:37:34 2017 +0200 ---------------------------------------------------------------------- docs/storm-kafka-client.md | 140 ++++--- .../TridentKafkaClientWordCountNamedTopics.java | 5 +- ...identKafkaClientWordCountWildcardTopics.java | 5 +- external/storm-kafka-client/pom.xml | 2 +- .../storm/kafka/spout/KafkaSpoutConfig.java | 364 +++++-------------- .../kafka/spout/SerializableDeserializer.java | 26 -- .../internal/KafkaConsumerFactoryDefault.java | 3 +- .../spout/trident/KafkaTridentSpoutManager.java | 3 +- .../storm/kafka/spout/KafkaSpoutConfigTest.java | 8 +- .../kafka/spout/MaxUncommittedOffsetTest.java | 3 +- .../SingleTopicKafkaSpoutConfiguration.java | 5 +- .../test/KafkaSpoutTopologyMainNamedTopics.java | 3 +- .../KafkaSpoutTopologyMainWildcardTopics.java | 3 +- 13 files changed, 186 insertions(+), 384 deletions(-) ----------------------------------------------------------------------