You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by sr...@apache.org on 2014/02/25 09:27:24 UTC
[14/19] git commit: Merge branch 'trunk' of
http://git-wip-us.apache.org/repos/asf/kafka into trunk
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/72610d1f
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/72610d1f
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/72610d1f
Branch: refs/heads/trunk
Commit: 72610d1fc0bbf706a14f1605bf9862ea3830e707
Parents: e88f1ac b5d1687
Author: Sriram Subramanian <sr...@gmail.com>
Authored: Fri Dec 20 13:01:45 2013 -0800
Committer: Sriram Subramanian <sr...@gmail.com>
Committed: Fri Dec 20 13:01:45 2013 -0800
----------------------------------------------------------------------
config/server.properties | 5 +-
.../main/java/kafka/etl/impl/DataGenerator.java | 3 +-
.../kafka/admin/ReassignPartitionsCommand.scala | 231 ++++++++++---------
.../main/scala/kafka/admin/TopicCommand.scala | 133 ++++++-----
.../src/main/scala/kafka/api/FetchRequest.scala | 2 +-
.../scala/kafka/api/RequestOrResponse.scala | 3 +
.../main/scala/kafka/cluster/Partition.scala | 12 +-
.../scala/kafka/consumer/ConsumerIterator.scala | 5 +-
.../main/scala/kafka/consumer/TopicFilter.scala | 6 -
.../consumer/ZookeeperConsumerConnector.scala | 37 ++-
.../consumer/ZookeeperTopicEventWatcher.scala | 19 +-
.../controller/ControllerChannelManager.scala | 11 +-
.../kafka/controller/KafkaController.scala | 32 ++-
.../controller/PartitionStateMachine.scala | 3 +-
.../kafka/controller/ReplicaStateMachine.scala | 29 +--
.../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/message/MessageAndMetadata.scala | 15 +-
.../kafka/producer/KafkaLog4jAppender.scala | 12 +-
.../kafka/server/AbstractFetcherManager.scala | 4 +-
.../src/main/scala/kafka/server/KafkaApis.scala | 13 +-
.../main/scala/kafka/server/KafkaConfig.scala | 17 +-
.../scala/kafka/server/ReplicaManager.scala | 169 ++++++++------
.../kafka/tools/ReplicaVerificationTool.scala | 60 ++---
.../test/scala/unit/kafka/admin/AdminTest.scala | 45 +++-
.../kafka/consumer/ConsumerIteratorTest.scala | 36 +++
.../unit/kafka/consumer/TopicFilterTest.scala | 4 -
.../scala/unit/kafka/log/LogSegmentTest.scala | 5 +-
.../src/test/scala/unit/kafka/log/LogTest.scala | 22 +-
.../unit/kafka/server/ISRExpirationTest.scala | 1 +
.../unit/kafka/server/LogRecoveryTest.scala | 1 +
.../unit/kafka/server/SimpleFetchTest.scala | 1 +
.../test/scala/unit/kafka/utils/TestUtils.scala | 10 +-
kafka-patch-review.py | 15 ++
project/Build.scala | 4 +-
.../config/server.properties | 5 +-
.../config/server.properties | 5 +-
.../config/server.properties | 5 +-
40 files changed, 605 insertions(+), 447 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/72610d1f/core/src/main/scala/kafka/controller/KafkaController.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/72610d1f/core/src/main/scala/kafka/server/KafkaConfig.scala
----------------------------------------------------------------------