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

[srdo]

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


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

Branch: refs/heads/master
Commit: b9aefbe3bff2ca7d2bf6fd4ee217e046e3f5071f
Parents: 399e35f c7b7b89
Author: Stig Rohde Døssing <s...@apache.org>
Authored: Tue Jul 18 22:38:48 2017 +0200
Committer: Stig Rohde Døssing <s...@apache.org>
Committed: Tue Jul 18 22:38:48 2017 +0200

----------------------------------------------------------------------
 .../spout/ManualPartitionNamedSubscription.java | 78 --------------------
 .../ManualPartitionPatternSubscription.java     | 76 -------------------
 .../spout/ManualPartitionSubscription.java      | 71 ++++++++++++++++++
 .../storm/kafka/spout/NamedTopicFilter.java     | 67 +++++++++++++++++
 .../storm/kafka/spout/PatternTopicFilter.java   | 69 +++++++++++++++++
 .../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, 388 insertions(+), 155 deletions(-)
----------------------------------------------------------------------