You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ju...@apache.org on 2013/01/26 07:04:36 UTC

[13/28] git commit: Merge branch '0.8' of https://git-wip-us.apache.org/repos/asf/kafka into 0.8

Merge branch '0.8' of https://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/22cd8bfd
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/22cd8bfd
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/22cd8bfd

Branch: refs/heads/trunk
Commit: 22cd8bfd6eca64a1a6d23ecef7f5dc938ac02c7f
Parents: b5d685b 0d197f9
Author: Neha Narkhede <ne...@gmail.com>
Authored: Tue Jan 22 12:15:37 2013 -0800
Committer: Neha Narkhede <ne...@gmail.com>
Committed: Tue Jan 22 12:15:37 2013 -0800

----------------------------------------------------------------------
 .../scala/kafka/controller/KafkaController.scala   |   35 ++++++++-------
 1 files changed, 19 insertions(+), 16 deletions(-)
----------------------------------------------------------------------