Details
-
Task
-
Status: Resolved
-
Major
-
Resolution: Fixed
-
None
-
None
-
None
Description
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
#