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

[srdo]

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

Branch: refs/heads/1.x-branch
Commit: 9dc5414615e92aee969216519db7e7dd794575e2
Parents: b24f5d8 689d31c
Author: Stig Rohde Døssing <s...@apache.org>
Authored: Tue Nov 21 20:06:29 2017 +0100
Committer: Stig Rohde Døssing <s...@apache.org>
Committed: Tue Nov 21 20:06:29 2017 +0100

----------------------------------------------------------------------
 .../storm/kafka/spout/KafkaSpoutConfig.java     |  2 +-
 .../storm/kafka/spout/KafkaSpoutConfigTest.java | 46 ++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
----------------------------------------------------------------------