Jun Rao created KAFKA-896:
-----------------------------
Summary: 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
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
