You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/01/06 17:40:56 UTC

[09/11] storm git commit: Merge branch 'STORM-586' of https://github.com/Parth-Brahmbhatt/incubator-storm into STORM-586-V2

Merge branch 'STORM-586' of https://github.com/Parth-Brahmbhatt/incubator-storm into STORM-586-V2


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

Branch: refs/heads/master
Commit: ebc9bc5ae3c74e13f06dcfe137125d1e22ed2d47
Parents: ab76e67 dc764b1
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Tue Jan 6 06:40:07 2015 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Tue Jan 6 06:40:07 2015 -0800

----------------------------------------------------------------------
 .../src/jvm/storm/kafka/KafkaUtils.java         | 10 ++---
 .../src/jvm/storm/kafka/PartitionManager.java   |  6 +--
 .../kafka/TopicOffsetOutOfRangeException.java   | 25 ++++++++++++
 .../jvm/storm/kafka/UpdateOffsetException.java  | 22 ----------
 .../kafka/trident/TridentKafkaEmitter.java      | 43 +++++++++++++-------
 .../src/test/storm/kafka/KafkaUtilsTest.java    |  2 +-
 6 files changed, 61 insertions(+), 47 deletions(-)
----------------------------------------------------------------------