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

[srdo]

Merge branch 'STORM-2541-1.x' of https://github.com/srdo/storm into 
STORM-2541-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/8cc00cb7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8cc00cb7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8cc00cb7

Branch: refs/heads/1.x-branch
Commit: 8cc00cb709fb07cca98f35d9c2041f0401ae6c6f
Parents: 568e6b7 955d317
Author: Stig Rohde Døssing <s...@apache.org>
Authored: Wed Jul 19 20:27:44 2017 +0200
Committer: Stig Rohde Døssing <s...@apache.org>
Committed: Wed Jul 19 20:27:44 2017 +0200

----------------------------------------------------------------------
 .../spout/ManualPartitionNamedSubscription.java | 78 --------------------
 .../ManualPartitionPatternSubscription.java     | 76 -------------------
 .../spout/ManualPartitionSubscription.java      | 71 ++++++++++++++++++
 .../storm/kafka/spout/NamedTopicFilter.java     | 68 +++++++++++++++++
 .../storm/kafka/spout/PatternTopicFilter.java   | 70 ++++++++++++++++++
 .../apache/storm/kafka/spout/Subscription.java  |  2 +-
 .../apache/storm/kafka/spout/TopicFilter.java   | 38 ++++++++++
 .../storm/kafka/spout/NamedTopicFilterTest.java | 69 +++++++++++++++++
 .../kafka/spout/PatternTopicFilterTest.java     | 73 ++++++++++++++++++
 9 files changed, 390 insertions(+), 155 deletions(-)
----------------------------------------------------------------------