[2/2] storm git commit: Merge branch 'STORM-2666-clean' of https://github.com/srdo/storm into STORM-2666-merge

[srdo]

Merge branch 'STORM-2666-clean' of https://github.com/srdo/storm into 
STORM-2666-merge


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

Branch: refs/heads/master
Commit: 4b2d6dc320f03317937e4908c404829944d84760
Parents: c607d04 cef7c92
Author: Stig Rohde Døssing <s...@apache.org>
Authored: Wed Oct 4 21:22:11 2017 +0200
Committer: Stig Rohde Døssing <s...@apache.org>
Committed: Wed Oct 4 21:22:11 2017 +0200

----------------------------------------------------------------------
 .../apache/storm/kafka/spout/KafkaSpout.java    |  57 ++--
 .../KafkaSpoutRetryExponentialBackoff.java      |  37 +--
 .../kafka/spout/KafkaSpoutRetryService.java     |   8 +-
 .../kafka/spout/internal/OffsetManager.java     |   8 +-
 .../storm/kafka/spout/KafkaSpoutCommitTest.java |  23 +-
 .../kafka/spout/KafkaSpoutRebalanceTest.java    |  70 ++++-
 .../KafkaSpoutRetryExponentialBackoffTest.java  | 287 +++++++++++++++++++
 .../kafka/spout/SingleTopicKafkaSpoutTest.java  |  62 +++-
 .../kafka/spout/internal/OffsetManagerTest.java |  84 ++++++
 9 files changed, 561 insertions(+), 75 deletions(-)
----------------------------------------------------------------------