Uploaded image for project: 'Kafka'
  1. Kafka
  2. KAFKA-896

merge 0.8 (988d4d8e65a14390abd748318a64e281e4a37c19) to trunk

    Details

    • Type: Task
    • Status: Resolved
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 0.8.1
    • Component/s: None
    • Labels:
      None

      Description

      Files that have conflicts:

      1. Unmerged paths:
      2. (use "git add/rm <file>..." as appropriate to mark resolution)
        #
      3. both modified: core/src/main/scala/kafka/admin/PreferredReplicaLeaderElectionCommand.scala
      4. both modified: core/src/main/scala/kafka/cluster/Partition.scala
      5. both modified: core/src/main/scala/kafka/log/FileMessageSet.scala
      6. both modified: core/src/main/scala/kafka/log/Log.scala
      7. both modified: core/src/main/scala/kafka/log/LogManager.scala
      8. both modified: core/src/main/scala/kafka/message/ByteBufferMessageSet.scala
      9. deleted by us: core/src/main/scala/kafka/server/HighwaterMarkCheckpoint.scala
      10. both modified: core/src/main/scala/kafka/server/KafkaApis.scala
      11. both modified: core/src/main/scala/kafka/server/ReplicaFetcherThread.scala
      12. both modified: core/src/main/scala/kafka/server/ReplicaManager.scala
      13. both modified: core/src/main/scala/kafka/tools/DumpLogSegments.scala
      14. both modified: core/src/test/scala/unit/kafka/admin/AdminTest.scala
      15. both modified: core/src/test/scala/unit/kafka/utils/TestUtils.scala
        #

      Files have to be changed manually due to merge.

      1. Changed but not updated:
      2. (use "git add <file>..." to update what will be committed)
      3. (use "git checkout – <file>..." to discard changes in working directory)
        #
      4. modified: core/src/main/scala/kafka/log/LogSegment.scala
      5. modified: core/src/test/scala/unit/kafka/producer/ProducerTest.scala
        #

        Attachments

        1. kafka-896.patch
          273 kB
          Jun Rao
        2. kafka-896_v2.patch
          278 kB
          Jun Rao

          Activity

            People

            • Assignee:
              junrao Jun Rao
              Reporter:
              junrao Jun Rao
            • Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: