[3/3] storm git commit: Merge branch 'STORM-2994-merge' into asfgit-master

[srdo]

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

Branch: refs/heads/master
Commit: 19cdedfc837c39bc382424d56998341492722fe9
Parents: 402a371 a9ea7d5
Author: Stig Rohde Døssing <s...@apache.org>
Authored: Tue Apr 3 18:27:15 2018 +0200
Committer: Stig Rohde Døssing <s...@apache.org>
Committed: Tue Apr 3 18:27:15 2018 +0200

----------------------------------------------------------------------
 .../apache/storm/kafka/spout/KafkaSpout.java    | 35 +++++---
 .../storm/kafka/spout/KafkaSpoutMessageId.java  | 28 +++---
 .../kafka/spout/KafkaSpoutNullTupleTest.java    | 93 ++++++++++++++++++++
 .../SingleTopicKafkaSpoutConfiguration.java     |  3 +
 4 files changed, 131 insertions(+), 28 deletions(-)
----------------------------------------------------------------------