You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@kafka.apache.org by "Jun Rao (JIRA)" <ji...@apache.org> on 2013/07/09 01:21:50 UTC
[jira] [Updated] (KAFKA-896) merge 0.8
(988d4d8e65a14390abd748318a64e281e4a37c19) to trunk
[ https://issues.apache.org/jira/browse/KAFKA-896?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Jun Rao updated KAFKA-896:
--------------------------
Resolution: Fixed
Fix Version/s: 0.8.1
Status: Resolved (was: Patch Available)
Thanks for the review. Committed to trunk after addressing the comments below.
1. The command is already there. We can file new jiras to make it an api.
2. This is added since it's useful to know when a high watermark doesn't exist.
3. This is because the usage of broker list is different btw 0.7 and 0.8. In 0.7, it's used to send the produce requests. In 0.8 it's only used to send metadata requests.
> merge 0.8 (988d4d8e65a14390abd748318a64e281e4a37c19) to trunk
> -------------------------------------------------------------
>
> Key: KAFKA-896
> URL: https://issues.apache.org/jira/browse/KAFKA-896
> Project: Kafka
> Issue Type: Task
> Reporter: Jun Rao
> Assignee: Jun Rao
> Fix For: 0.8.1
>
> Attachments: kafka-896.patch, kafka-896_v2.patch
>
>
> Files that have conflicts:
> # Unmerged paths:
> # (use "git add/rm <file>..." as appropriate to mark resolution)
> #
> # both modified: core/src/main/scala/kafka/admin/PreferredReplicaLeaderElectionCommand.scala
> # both modified: core/src/main/scala/kafka/cluster/Partition.scala
> # both modified: core/src/main/scala/kafka/log/FileMessageSet.scala
> # both modified: core/src/main/scala/kafka/log/Log.scala
> # both modified: core/src/main/scala/kafka/log/LogManager.scala
> # both modified: core/src/main/scala/kafka/message/ByteBufferMessageSet.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/ReplicaFetcherThread.scala
> # both modified: core/src/main/scala/kafka/server/ReplicaManager.scala
> # both modified: core/src/main/scala/kafka/tools/DumpLogSegments.scala
> # both modified: core/src/test/scala/unit/kafka/admin/AdminTest.scala
> # both modified: core/src/test/scala/unit/kafka/utils/TestUtils.scala
> #
> Files have to be changed manually due to merge.
> # 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/log/LogSegment.scala
> # modified: core/src/test/scala/unit/kafka/producer/ProducerTest.scala
> #
--
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