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

[srdo]

Merge branch 'STORM-2850-1.x' 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/2181fcde
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2181fcde
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2181fcde

Branch: refs/heads/1.x-branch
Commit: 2181fcde3f95302e1363d07a72c2b16c5332bd6c
Parents: e2e3f5d 7cdde90
Author: Stig Rohde Døssing <s...@apache.org>
Authored: Tue Dec 12 00:09:45 2017 +0100
Committer: Stig Rohde Døssing <s...@apache.org>
Committed: Tue Dec 12 00:09:45 2017 +0100

----------------------------------------------------------------------
 .../spout/ManualPartitionSubscription.java      |  2 +-
 .../ManualPartitionSubscriptionTest.java        | 79 ++++++++++++++++++++
 2 files changed, 80 insertions(+), 1 deletion(-)
----------------------------------------------------------------------