-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/15711/
-----------------------------------------------------------
(Updated Feb. 24, 2014, 9:59 a.m.)
Review request for kafka.
Bugs: KAFKA-930
https://issues.apache.org/jira/browse/KAFKA-930
Repository: kafka
Description (updated)
-------
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/kafka into trunk
Conflicts:
core/src/main/scala/kafka/controller/KafkaController.scala
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
Conflicts:
core/src/main/scala/kafka/controller/KafkaController.scala
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/kafka into trunk
some more changes
use zk for auto rebalance
Address code review feedbacks
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/kafka into trunk
commit missing code
some more changes
fix merge conflicts
Add auto leader rebalance support
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
Conflicts:
core/src/main/scala/kafka/admin/AdminUtils.scala
core/src/main/scala/kafka/admin/TopicCommand.scala
change comments
commit the remaining changes
Move AddPartitions into TopicCommand
Diffs (updated)
-----
core/src/main/scala/kafka/controller/KafkaController.scala
00a1f9802474a688fe725db8d6bff493ede48684
Diff: https://reviews.apache.org/r/15711/diff/
Testing
-------
Thanks,
Sriram Subramanian
