Merge branch '0.8' of http://git-wip-us.apache.org/repos/asf/kafka into 0.8
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/ea54700d Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/ea54700d Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/ea54700d Branch: refs/heads/trunk Commit: ea54700d57e18e59e210814b70bddca38739d414 Parents: 51de7c5 39fc578 Author: Jun Rao <[email protected]> Authored: Wed Aug 28 09:53:07 2013 -0700 Committer: Jun Rao <[email protected]> Committed: Wed Aug 28 09:53:07 2013 -0700 ---------------------------------------------------------------------- .../kafka/admin/ReassignPartitionsCommand.scala | 94 +++++++++++--- .../kafka/controller/KafkaController.scala | 130 +++++++++---------- .../kafka/controller/ReplicaStateMachine.scala | 7 +- core/src/main/scala/kafka/utils/ZkUtils.scala | 18 +++ 4 files changed, 162 insertions(+), 87 deletions(-) ----------------------------------------------------------------------
