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

[srdo]

Merge branch 'STORM-2826' of https://github.com/srdo/storm into 
asfgit-1.x-branch


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

Branch: refs/heads/1.x-branch
Commit: 315aa9e633d7e90856f1c2b0cc598159f2398140
Parents: d76370a 1811351
Author: Stig Rohde Døssing <s...@apache.org>
Authored: Sat Dec 16 01:02:21 2017 +0100
Committer: Stig Rohde Døssing <s...@apache.org>
Committed: Sat Dec 16 01:02:21 2017 +0100

----------------------------------------------------------------------
 .../storm/kafka/spout/KafkaSpoutConfig.java     |  92 ++++++++---------
 .../storm/kafka/spout/KafkaSpoutConfigTest.java | 102 +++++++++++++++++++
 2 files changed, 148 insertions(+), 46 deletions(-)
----------------------------------------------------------------------