[2/2] storm git commit: Merge branch 'STORM-2546' of https://github.com/srdo/storm into asfgit-master

[srdo]

Merge branch 'STORM-2546' of https://github.com/srdo/storm into asfgit-master


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

Branch: refs/heads/master
Commit: 3ee5543f06978765ee1d66bce0fc6530f68076d9
Parents: a1ef0f6 88583fe
Author: Stig Rohde Døssing <s...@apache.org>
Authored: Wed Nov 15 08:21:18 2017 +0100
Committer: Stig Rohde Døssing <s...@apache.org>
Committed: Wed Nov 15 08:21:18 2017 +0100

----------------------------------------------------------------------
 .../apache/storm/kafka/spout/KafkaSpout.java    |  48 +++-
 .../storm/kafka/spout/KafkaSpoutConfig.java     |  25 +++
 .../storm/kafka/spout/KafkaSpoutCommitTest.java | 119 ----------
 .../storm/kafka/spout/KafkaSpoutConfigTest.java |  24 ++
 .../storm/kafka/spout/KafkaSpoutEmitTest.java   |   9 +-
 .../KafkaSpoutLogCompactionSupportTest.java     | 221 +++++++++++++++++++
 .../spout/KafkaSpoutMessagingGuaranteeTest.java |   8 +-
 .../kafka/spout/KafkaSpoutRetryLimitTest.java   |   3 +-
 .../SpoutWithMockedConsumerSetupHelper.java     |  68 +++++-
 .../kafka/spout/internal/OffsetManagerTest.java |   1 -
 10 files changed, 382 insertions(+), 144 deletions(-)
----------------------------------------------------------------------