[KAFKA-896] merge 0.8 (988d4d8e65a14390abd748318a64e281e4a37c19) to trunk

• Type: Task
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Fix Version/s: 0.8.1
• Assignee: Jun Rao
• Reporter: Jun Rao
• Created: 03/May/13 02:14
• Updated: 08/Jul/13 23:20
• Resolved: 08/Jul/13 23:20

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
   #