Merge remote branch 'origin/0.8' into trunk
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/bfc4ba49
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/bfc4ba49
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/bfc4ba49
Branch: refs/heads/trunk
Commit: bfc4ba499521addf3d109c3fbe77b8908eabc644
Parents: 8959690 1cb2175
Author: Jun Rao <junrao@gmail.com>
Authored: Mon Oct 7 14:29:16 2013 -0700
Committer: Jun Rao <junrao@gmail.com>
Committed: Mon Oct 7 14:29:16 2013 -0700
----------------------------------------------------------------------
bin/kafka-check-reassignment-status.sh | 17 ---
config/test-log4j.properties | 68 ++++++++++++
.../main/java/kafka/etl/KafkaETLContext.java | 2 +-
.../kafka/etl/impl/SimpleKafkaETLMapper.java | 7 +-
.../kafka/admin/CheckReassignmentStatus.scala | 110 -------------------
.../kafka/admin/ReassignPartitionsCommand.scala | 74 +++++++++++--
.../src/main/scala/kafka/api/FetchRequest.scala | 3 +-
.../main/scala/kafka/api/ProducerRequest.scala | 15 ++-
.../consumer/ZookeeperConsumerConnector.scala | 52 ++++++---
.../kafka/controller/KafkaController.scala | 5 +-
.../producer/async/DefaultEventHandler.scala | 4 +-
.../test/scala/unit/kafka/admin/AdminTest.scala | 6 +-
project/Build.scala | 5 +-
system_test/utils/kafka_system_test_utils.py | 1 +
14 files changed, 195 insertions(+), 174 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/bfc4ba49/contrib/hadoop-consumer/src/main/java/kafka/etl/impl/SimpleKafkaETLMapper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/bfc4ba49/core/src/main/scala/kafka/consumer/ZookeeperConsumerConnector.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/bfc4ba49/core/src/main/scala/kafka/producer/async/DefaultEventHandler.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/bfc4ba49/core/src/test/scala/unit/kafka/admin/AdminTest.scala
----------------------------------------------------------------------
|