[
https://issues.apache.org/jira/browse/KAFKA-965?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Jun Rao updated KAFKA-965:
--------------------------
Attachment: kafka-965.patch
Attach a patch. The following files have to be merged manually.
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: core/src/main/scala/kafka/admin/AdminUtils.scala
# both modified: core/src/main/scala/kafka/api/RequestKeys.scala
# both modified: core/src/main/scala/kafka/log/Log.scala
# both modified: core/src/main/scala/kafka/log/LogSegment.scala
# deleted by us:
core/src/main/scala/kafka/server/HighwaterMarkCheckpoint.scala
# both modified: core/src/main/scala/kafka/server/KafkaApis.scala
# both modified: core/src/main/scala/kafka/server/KafkaConfig.scala
# both modified: core/src/main/scala/kafka/server/KafkaServer.scala
# both modified:
core/src/main/scala/kafka/server/ReplicaManager.scala
# both modified: core/src/main/scala/kafka/utils/ZkUtils.scala
# both modified: core/src/test/scala/unit/kafka/admin/AdminTest.scala
# both modified:
core/src/test/scala/unit/kafka/integration/PrimitiveApiTest.scala
# both modified:
core/src/test/scala/unit/kafka/integration/TopicMetadataTest.scala
# both modified:
core/src/test/scala/unit/kafka/producer/ProducerTest.scala
# both modified:
core/src/test/scala/unit/kafka/server/HighwatermarkPersistenceTest.scala
# both modified:
core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala
# both modified:
core/src/test/scala/unit/kafka/server/SimpleFetchTest.scala
#
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: core/src/main/scala/kafka/server/OffsetCheckpoint.scala
> merge c39d37e9dd97bf2462ffbd1a96c0b2cb05034bae from 0.8 to trunk
> ----------------------------------------------------------------
>
> Key: KAFKA-965
> URL: https://issues.apache.org/jira/browse/KAFKA-965
> Project: Kafka
> Issue Type: Task
> Components: core
> Affects Versions: 0.8.1
> Reporter: Jun Rao
> Assignee: Jun Rao
> Attachments: kafka-965.patch
>
>
--
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
