Merge branch 'STORM-511-offset-fix' of github.com:viktortnk/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e757b6cb Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e757b6cb Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e757b6cb Branch: refs/heads/security Commit: e757b6cb1e111b61956588fc2819d4466356d6ee Parents: aae64a0 e61162c Author: P. Taylor Goetz <[email protected]> Authored: Mon Oct 27 16:47:02 2014 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Mon Oct 27 16:47:02 2014 -0400 ---------------------------------------------------------------------- .../src/jvm/storm/kafka/KafkaUtils.java | 63 ++++++++++---------- .../src/jvm/storm/kafka/PartitionManager.java | 11 +++- .../jvm/storm/kafka/UpdateOffsetException.java | 5 ++ .../src/test/storm/kafka/KafkaUtilsTest.java | 6 +- 4 files changed, 47 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
