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

[srdo]

Merge branch 'STORM-2549' 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/0ae5068a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0ae5068a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0ae5068a

Branch: refs/heads/master
Commit: 0ae5068a205becfafc75bd8e11c2c672c76e0f61
Parents: 445f439 cca93d2
Author: Stig Rohde Døssing <s...@apache.org>
Authored: Fri Nov 10 17:03:14 2017 +0100
Committer: Stig Rohde Døssing <s...@apache.org>
Committed: Fri Nov 10 17:03:14 2017 +0100

----------------------------------------------------------------------
 .../apache/storm/kafka/spout/KafkaSpout.java    | 108 ++++++++-------
 .../storm/kafka/spout/KafkaSpoutConfig.java     |  11 +-
 .../kafka/spout/internal/OffsetManager.java     |  22 +++
 .../storm/kafka/spout/KafkaSpoutCommitTest.java |  12 +-
 .../storm/kafka/spout/KafkaSpoutEmitTest.java   | 137 +++++++------------
 .../kafka/spout/KafkaSpoutRebalanceTest.java    |  14 +-
 .../kafka/spout/KafkaSpoutRetryLimitTest.java   |  11 +-
 .../kafka/spout/MaxUncommittedOffsetTest.java   |  32 +++--
 .../kafka/spout/SingleTopicKafkaSpoutTest.java  |  51 +++++--
 .../SpoutWithMockedConsumerSetupHelper.java     |  33 +++--
 .../SingleTopicKafkaSpoutConfiguration.java     |   2 +-
 .../kafka/spout/internal/OffsetManagerTest.java |  15 ++
 12 files changed, 252 insertions(+), 196 deletions(-)
----------------------------------------------------------------------