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/7f32a1c2 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/7f32a1c2 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/7f32a1c2 Branch: refs/heads/trunk Commit: 7f32a1c276f5a027870d7cc340cce34274d9a896 Parents: 033872b cd81d37 Author: Sriram Subramanian <[email protected]> Authored: Thu Nov 21 09:25:35 2013 -0800 Committer: Sriram Subramanian <[email protected]> Committed: Thu Nov 21 09:25:35 2013 -0800 ---------------------------------------------------------------------- .../src/main/scala/kafka/admin/AdminUtils.scala | 2 +- .../PreferredReplicaLeaderElectionCommand.scala | 9 +- .../main/scala/kafka/api/FetchResponse.scala | 4 - .../scala/kafka/api/LeaderAndIsrRequest.scala | 6 +- .../main/scala/kafka/api/OffsetResponse.scala | 6 +- .../main/scala/kafka/consumer/TopicCount.scala | 23 +- .../consumer/ZookeeperConsumerConnector.scala | 8 +- .../kafka/controller/KafkaController.scala | 2 +- .../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 +- .../kafka/server/ZookeeperLeaderElector.scala | 6 +- .../kafka/tools/ReplicaVerificationTool.scala | 387 +++++++++++++++++++ core/src/main/scala/kafka/utils/Utils.scala | 59 --- core/src/main/scala/kafka/utils/ZkUtils.scala | 33 +- .../api/RequestResponseSerializationTest.scala | 8 +- .../scala/unit/kafka/log/LogSegmentTest.scala | 5 +- .../src/test/scala/unit/kafka/log/LogTest.scala | 22 +- .../test/scala/unit/kafka/utils/TestUtils.scala | 10 +- project/Build.scala | 2 + 21 files changed, 470 insertions(+), 194 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/7f32a1c2/core/src/main/scala/kafka/controller/KafkaController.scala ----------------------------------------------------------------------
