Merge branch 'STORM-511-offset-fix' of github.com:viktortnk/storm into storm-511
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1897dee6 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1897dee6 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1897dee6 Branch: refs/heads/security Commit: 1897dee648686282d3bee948ed04c01b8bae729a Parents: cfe7e63 d34037d Author: P. Taylor Goetz <[email protected]> Authored: Wed Oct 22 15:52:59 2014 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Wed Oct 22 15:52:59 2014 -0400 ---------------------------------------------------------------------- .../src/jvm/storm/kafka/KafkaUtils.java | 64 ++++++++++---------- .../src/jvm/storm/kafka/PartitionManager.java | 8 ++- .../jvm/storm/kafka/UpdateOffsetException.java | 10 +++ .../src/test/storm/kafka/KafkaUtilsTest.java | 6 +- 4 files changed, 50 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
