You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/02/05 06:38:43 UTC

[4/5] storm git commit: Merge branch 'kafka-spout' of https://github.com/abhishekagarwal87/storm into STORM-1455

Merge branch 'kafka-spout' of https://github.com/abhishekagarwal87/storm into STORM-1455


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

Branch: refs/heads/master
Commit: aeb9dcc19c57efe51bf6db3474ea987d4a7ed46e
Parents: 695f8c9 0bd8316
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Feb 5 14:36:45 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Feb 5 14:36:45 2016 +0900

----------------------------------------------------------------------
 .../jvm/org/apache/storm/kafka/KafkaSpout.java  |  8 ++--
 .../jvm/org/apache/storm/kafka/KafkaUtils.java  | 44 +++++++++++---------
 .../apache/storm/kafka/PartitionManager.java    | 42 +++++++++++++------
 .../kafka/trident/TridentKafkaEmitter.java      | 23 +++++-----
 4 files changed, 71 insertions(+), 46 deletions(-)
----------------------------------------------------------------------