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

[9/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/d5c980a9
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/d5c980a9
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/d5c980a9

Branch: refs/heads/trunk
Commit: d5c980a912e2d1f48e99ccc16c713b1ba187b716
Parents: e6aa600 f112ef2
Author: Joe Stein <jo...@apache.org>
Authored: Mon Jan 21 14:42:01 2013 -0500
Committer: Joe Stein <jo...@apache.org>
Committed: Mon Jan 21 14:42:01 2013 -0500

----------------------------------------------------------------------
 .../kafka/controller/ReplicaStateMachine.scala     |   16 +++++++-------
 .../kafka/producer/async/DefaultEventHandler.scala |    3 +-
 perf/src/main/scala/kafka/perf/PerfConfig.scala    |    2 +-
 .../scala/kafka/perf/ProducerPerformance.scala     |   14 -------------
 4 files changed, 11 insertions(+), 24 deletions(-)
----------------------------------------------------------------------