Merge branch 'STORM-2353-1.x-merge' into 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/4c7cfba6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4c7cfba6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4c7cfba6

Branch: refs/heads/1.x-branch
Commit: 4c7cfba6fa42ba37d89fd8c883f1a187aa04630a
Parents: 28472d1 f4bde50
Author: Jungtaek Lim <[email protected]>
Authored: Thu Mar 9 19:38:53 2017 +0900
Committer: Jungtaek Lim <[email protected]>
Committed: Thu Mar 9 19:38:53 2017 +0900

----------------------------------------------------------------------
 external/storm-kafka-client/pom.xml             |  35 ++++--
 .../java/org/apache/storm/kafka/KafkaUnit.java  | 111 +++++++++++++++++++
 .../org/apache/storm/kafka/KafkaUnitRule.java   |  46 ++++++++
 .../kafka/spout/SingleTopicKafkaSpoutTest.java  |  22 ++--
 4 files changed, 197 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


Reply via email to