[2/2] storm git commit: Merge branch '1.x-branch' of https://github.com/reiabreu/storm into STORM-2994-1.x-merge

[srdo]

Merge branch '1.x-branch' of https://github.com/reiabreu/storm into 
STORM-2994-1.x-merge


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

Branch: refs/heads/1.x-branch
Commit: caf6d88a2196991e2494ca80a89e33afe990483a
Parents: 9aac3e0 d8a37d8
Author: Stig Rohde Døssing <s...@apache.org>
Authored: Tue Apr 3 22:19:31 2018 +0200
Committer: Stig Rohde Døssing <s...@apache.org>
Committed: Tue Apr 3 22:19:31 2018 +0200

----------------------------------------------------------------------
 .../apache/storm/kafka/spout/KafkaSpout.java    |  32 +++---
 .../storm/kafka/spout/KafkaSpoutMessageId.java  |  28 ++---
 .../kafka/spout/KafkaSpoutNullTupleTest.java    | 103 +++++++++++++++++++
 3 files changed, 137 insertions(+), 26 deletions(-)
----------------------------------------------------------------------