Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/kafka into trunk
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/39c5b75c Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/39c5b75c Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/39c5b75c Branch: refs/heads/trunk Commit: 39c5b75c9675636d1f77a549fc55b527ed1d7f38 Parents: 793b607 58789d7 Author: Sriram Subramanian <[email protected]> Authored: Tue Nov 19 16:04:16 2013 -0800 Committer: Sriram Subramanian <[email protected]> Committed: Tue Nov 19 16:04:16 2013 -0800 ---------------------------------------------------------------------- bin/kafka-run-class.sh | 43 +++++++++++++++++--- bin/kafka-server-start.sh | 17 +++++++- bin/zookeeper-server-start.sh | 17 +++++++- config/log4j.properties | 11 +++-- .../main/scala/kafka/log/FileMessageSet.scala | 2 + core/src/main/scala/kafka/log/Log.scala | 28 ++++++------- core/src/main/scala/kafka/log/LogManager.scala | 2 + core/src/main/scala/kafka/log/OffsetIndex.scala | 40 ++++++++++-------- .../scala/unit/kafka/log/LogSegmentTest.scala | 5 +-- .../src/test/scala/unit/kafka/log/LogTest.scala | 22 +++++----- .../test/scala/unit/kafka/utils/TestUtils.scala | 10 ++++- 11 files changed, 136 insertions(+), 61 deletions(-) ----------------------------------------------------------------------
