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

[srdo]

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


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

Branch: refs/heads/master
Commit: 32d0b473e9eb048fca5822de7970324431e1bf11
Parents: ce19f81 de0d270
Author: Stig Rohde Døssing <s...@apache.org>
Authored: Thu Jul 20 23:22:13 2017 +0200
Committer: Stig Rohde Døssing <s...@apache.org>
Committed: Thu Jul 20 23:22:13 2017 +0200

----------------------------------------------------------------------
 .../spout/subscription/ManualPartitionSubscription.java      | 8 ++++----
 .../storm/kafka/spout/subscription/ManualPartitioner.java    | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------