You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ju...@apache.org on 2013/02/12 16:52:44 UTC
[2/2] git commit: Merge branch '0.8' of
https://git-wip-us.apache.org/repos/asf/kafka into 0.8
Updated Branches:
refs/heads/0.8 790a1504c -> 879d2692e
Merge branch '0.8' of https://git-wip-us.apache.org/repos/asf/kafka into 0.8
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/879d2692
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/879d2692
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/879d2692
Branch: refs/heads/0.8
Commit: 879d2692ea1192a4989297acbcbc01092ccbfb54
Parents: 2f0df95 790a150
Author: Jun Rao <ju...@gmail.com>
Authored: Tue Feb 12 07:52:21 2013 -0800
Committer: Jun Rao <ju...@gmail.com>
Committed: Tue Feb 12 07:52:21 2013 -0800
----------------------------------------------------------------------
core/src/main/scala/kafka/log/Log.scala | 8 ++++-
core/src/main/scala/kafka/log/OffsetIndex.scala | 20 +++++++++-----
.../scala/unit/kafka/log/OffsetIndexTest.scala | 6 +++-
3 files changed, 23 insertions(+), 11 deletions(-)
----------------------------------------------------------------------