[ 
https://issues.apache.org/jira/browse/KAFKA-823?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jun Rao updated KAFKA-823:
--------------------------

    Attachment: kafka-823.patch

Attach a patch. The following 7 files have conflicts.

config/log4j.properties
core/src/main/scala/kafka/log/Log.scala
core/src/main/scala/kafka/server/ReplicaFetcherThread.scala
core/src/main/scala/kafka/server/ReplicaManager.scala
core/src/main/scala/kafka/tools/DumpLogSegments.scala
core/src/main/scala/kafka/tools/SimpleConsumerShell.scala
core/src/test/scala/unit/kafka/log/LogTest.scala

The only file that needs non-trivial manual merge is log.scala. Please review.
                
> merge 0.8 (51421fcc0111031bb77f779a6f6c00520d526a34) to trunk
> -------------------------------------------------------------
>
>                 Key: KAFKA-823
>                 URL: https://issues.apache.org/jira/browse/KAFKA-823
>             Project: Kafka
>          Issue Type: Task
>          Components: core
>            Reporter: Jun Rao
>            Assignee: Jun Rao
>         Attachments: kafka-823.patch
>
>
> merge 0.8 up to the following commit to trunk
> commit 51421fcc0111031bb77f779a6f6c00520d526a34
> Author: Neha Narkhede <neha.narkh...@gmail.com>
> Date:   Fri Mar 22 09:32:27 2013 -0700
>     KAFKA-816 Reduce noise in Kafka server logs due to 
> NotLeaderForPartitionException; reviewed by Jun Rao

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

Reply via email to