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:58 UTC
[11/11] storm git commit: Merge branch 'STORM-586-V2'
Merge branch '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/36f75224
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/36f75224
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/36f75224
Branch: refs/heads/master
Commit: 36f75224e6aeb196caac0b43123b12014ac118ff
Parents: 01729f1 ee4bd37
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Tue Jan 6 08:35:56 2015 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Tue Jan 6 08:35:56 2015 -0800
----------------------------------------------------------------------
CHANGELOG.md | 1 +
.../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 +-
7 files changed, 62 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/36f75224/CHANGELOG.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/36f75224/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java
----------------------------------------------------------------------