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/09/11 19:03:59 UTC

[14/36] git commit: Merge branch '0.8' of http://git-wip-us.apache.org/repos/asf/kafka into 0.8

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

Branch: refs/heads/trunk
Commit: ed3e146cf4b48683756e3c445f539fa99ba9076a
Parents: 0c8aefc b6479e8
Author: Jun Rao <ju...@gmail.com>
Authored: Thu Aug 1 21:31:46 2013 -0700
Committer: Jun Rao <ju...@gmail.com>
Committed: Thu Aug 1 21:31:46 2013 -0700

----------------------------------------------------------------------
 contrib/hadoop-producer/README.md               |  4 ++--
 .../kafka/bridge/hadoop/KafkaOutputFormat.java  | 12 +++++++-----
 .../kafka/bridge/hadoop/KafkaRecordWriter.java  | 20 +++++++++++---------
 .../main/scala/kafka/server/KafkaConfig.scala   |  4 ++--
 4 files changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------