See <https://builds.apache.org/job/kafka-trunk-git-pr/4/>

------------------------------------------
[...truncated 1916 lines...]
jdk1.7.0_51/jre/lib/currency.data
jdk1.7.0_51/jre/lib/javafx.properties
jdk1.7.0_51/jre/THIRDPARTYLICENSEREADME.txt
jdk1.7.0_51/jre/Welcome.html
jdk1.7.0_51/jre/LICENSE
jdk1.7.0_51/jre/plugin/
jdk1.7.0_51/jre/plugin/desktop/
jdk1.7.0_51/jre/plugin/desktop/sun_java.png
jdk1.7.0_51/jre/plugin/desktop/sun_java.desktop
jdk1.7.0_51/jre/COPYRIGHT
jdk1.7.0_51/jre/THIRDPARTYLICENSEREADME-JAVAFX.txt
jdk1.7.0_51/LICENSE
jdk1.7.0_51/COPYRIGHT
jdk1.7.0_51/THIRDPARTYLICENSEREADME-JAVAFX.txt
Cloning the remote Git repository
Cloning repository git://github.com/apache/kafka.git
 > git init <https://builds.apache.org/job/kafka-trunk-git-pr/ws/> # timeout=10
Fetching upstream changes from git://github.com/apache/kafka.git
 > git --version # timeout=10
 > git fetch --tags --progress git://github.com/apache/kafka.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git config remote.origin.url git://github.com/apache/kafka.git # timeout=10
 > git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # 
 > timeout=10
 > git config remote.origin.url git://github.com/apache/kafka.git # timeout=10
Fetching upstream changes from git://github.com/apache/kafka.git
 > git fetch --tags --progress git://github.com/apache/kafka.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/0.8.1 # timeout=10
 > git branch -a # timeout=10
 > git rev-parse remotes/origin/0.7^{commit} # timeout=10
 > git rev-parse remotes/origin/0.7.0^{commit} # timeout=10
 > git rev-parse remotes/origin/0.7.1^{commit} # timeout=10
 > git rev-parse remotes/origin/0.7.2^{commit} # timeout=10
 > git rev-parse remotes/origin/0.8^{commit} # timeout=10
 > git rev-parse remotes/origin/0.8.0-beta1-candidate1^{commit} # timeout=10
 > git rev-parse remotes/origin/0.8.1^{commit} # timeout=10
 > git rev-parse remotes/origin/0.8.2^{commit} # timeout=10
 > git rev-parse remotes/origin/consumer_redesign^{commit} # timeout=10
 > git rev-parse remotes/origin/legacy_client_libraries^{commit} # timeout=10
 > git rev-parse remotes/origin/transactional_messaging^{commit} # timeout=10
 > git rev-parse remotes/origin/trunk^{commit} # timeout=10
 > git checkout -b 0.8.1 origin/0.8.1
  Opening connection
    Done: 0
  Counting objects
    Done: 0
  Finding sources
    Done: 0
  Writing objects
    Done: 0
  remote: Updating references
Merging refs/tags/changes/4
 > git rev-parse refs/tags/changes/4^{commit} # timeout=10
 > git merge fa03a7c6c48550f01176402139201af75d3836a2 # timeout=10
FATAL: Could not merge AnyObjectId[fa03a7c6c48550f01176402139201af75d3836a2]
hudson.plugins.git.GitException: Could not merge 
AnyObjectId[fa03a7c6c48550f01176402139201af75d3836a2]
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:469)
        at 
org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:76)
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:85)
        at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
        at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
        at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
        at java.lang.reflect.Method.invoke(Method.java:606)
        at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:310)
        at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:290)
        at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:249)
        at hudson.remoting.UserRequest.perform(UserRequest.java:118)
        at hudson.remoting.UserRequest.perform(UserRequest.java:48)
        at hudson.remoting.Request$2.run(Request.java:328)
        at 
hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
        at java.util.concurrent.FutureTask.run(FutureTask.java:262)
        at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
        at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
        at java.lang.Thread.run(Thread.java:745)
Caused by: hudson.plugins.git.GitException: Command "git merge 
fa03a7c6c48550f01176402139201af75d3836a2" returned status code 1:
stdout: Removing system_test/testcase_to_run.json
Auto-merging 
system_test/offset_management_testsuite/testcase_7002/config/zookeeper_0.properties
Auto-merging system_test/offset_management_testsuite/offset_management_test.py
Auto-merging system_test/offset_management_testsuite/config/zookeeper.properties
Auto-merging system_test/offset_management_testsuite/config/server.properties
Auto-merging system_test/offset_management_testsuite/cluster_config.json
Auto-merging 
system_test/mirror_maker_testsuite/testcase_15006/cluster_config.json
Auto-merging 
system_test/mirror_maker_testsuite/testcase_15005/cluster_config.json
Auto-merging 
system_test/mirror_maker_testsuite/testcase_15004/cluster_config.json
Auto-merging 
system_test/mirror_maker_testsuite/testcase_15003/cluster_config.json
Removing system_test/mirror_maker/config/zookeeper_source_2.properties
Removing system_test/mirror_maker/config/whitelisttest_2.consumer.properties
Removing system_test/mirror_maker/config/whitelisttest_1.consumer.properties
Removing system_test/mirror_maker/config/server_target_1_2.properties
Removing system_test/mirror_maker/config/server_target_1_1.properties
Removing system_test/mirror_maker/config/server_source_2_2.properties
Removing system_test/mirror_maker/config/server_source_2_1.properties
Removing system_test/mirror_maker/config/server_source_1_2.properties
Removing system_test/mirror_maker/config/server_source_1_1.properties
Removing system_test/mirror_maker/config/mirror_producer.properties
Removing system_test/mirror_maker/config/blacklisttest.consumer.properties
Removing system_test/mirror_maker/bin/run-test.sh
Removing system_test/mirror_maker/bin/expected.out
Removing system_test/mirror_maker/README
Removing 
system_test/migration_tool_testsuite/testcase_9006/testcase_9006_properties.json
Removing 
system_test/migration_tool_testsuite/testcase_9005/testcase_9005_properties.json
Removing 
system_test/migration_tool_testsuite/testcase_9004/testcase_9004_properties.json
Removing 
system_test/migration_tool_testsuite/testcase_9003/testcase_9003_properties.json
Removing 
system_test/migration_tool_testsuite/testcase_9001/testcase_9001_properties.json
Removing 
system_test/migration_tool_testsuite/config/migration_producer.properties
Removing 
system_test/migration_tool_testsuite/config/migration_consumer.properties
Removing system_test/migration_tool_testsuite/__init__.py
Removing system_test/migration_tool_testsuite/0.7/lib/zkclient-0.1.jar
Removing system_test/migration_tool_testsuite/0.7/lib/kafka-perf-0.7.0.jar
Removing system_test/migration_tool_testsuite/0.7/lib/kafka-0.7.0.jar
Removing system_test/migration_tool_testsuite/0.7/config/test-log4j.properties
Removing system_test/migration_tool_testsuite/0.7/bin/kafka-run-class.sh
Auto-merging settings.gradle
CONFLICT (content): Merge conflict in settings.gradle
Auto-merging scala.gradle
CONFLICT (add/add): Merge conflict in scala.gradle
Removing perf/src/main/scala/kafka/perf/ConsumerPerformance.scala
Removing perf/config/log4j.properties
Removing lib/apache-rat-0.8.jar
Removing gradle/wrapper/gradle-wrapper.properties
Removing gradle/wrapper/gradle-wrapper.jar
Removing gradle/license.gradle
Auto-merging gradle.properties
CONFLICT (content): Merge conflict in gradle.properties
Auto-merging core/src/test/scala/unit/kafka/utils/TestUtils.scala
CONFLICT (content): Merge conflict in 
core/src/test/scala/unit/kafka/utils/TestUtils.scala
Auto-merging core/src/test/scala/unit/kafka/server/SimpleFetchTest.scala
CONFLICT (content): Merge conflict in 
core/src/test/scala/unit/kafka/server/SimpleFetchTest.scala
Auto-merging core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala
CONFLICT (content): Merge conflict in 
core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala
Removing core/src/test/scala/unit/kafka/server/RequestPurgatoryTest.scala
Auto-merging core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala
CONFLICT (add/add): Merge conflict in 
core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala
Auto-merging 
core/src/test/scala/unit/kafka/server/HighwatermarkPersistenceTest.scala
Auto-merging core/src/test/scala/unit/kafka/server/DynamicConfigChangeTest.scala
CONFLICT (add/add): Merge conflict in 
core/src/test/scala/unit/kafka/server/DynamicConfigChangeTest.scala
CONFLICT (modify/delete): 
core/src/test/scala/unit/kafka/log4j/KafkaLog4jAppenderTest.scala deleted in 
fa03a7c6c48550f01176402139201af75d3836a2 and modified in HEAD. Version HEAD of 
core/src/test/scala/unit/kafka/log4j/KafkaLog4jAppenderTest.scala left in tree.
Auto-merging core/src/test/scala/unit/kafka/log/LogManagerTest.scala
CONFLICT (content): Merge conflict in 
core/src/test/scala/unit/kafka/log/LogManagerTest.scala
Auto-merging core/src/test/scala/unit/kafka/log/LogCleanerIntegrationTest.scala
CONFLICT (content): Merge conflict in 
core/src/test/scala/unit/kafka/log/LogCleanerIntegrationTest.scala
Auto-merging core/src/test/scala/unit/kafka/log/CleanerTest.scala
CONFLICT (content): Merge conflict in 
core/src/test/scala/unit/kafka/log/CleanerTest.scala
Removing core/src/test/scala/unit/kafka/integration/LazyInitProducerTest.scala
Auto-merging core/src/test/scala/unit/kafka/admin/DeleteTopicTest.scala
CONFLICT (content): Merge conflict in 
core/src/test/scala/unit/kafka/admin/DeleteTopicTest.scala
Auto-merging core/src/test/scala/unit/kafka/admin/AdminTest.scala
CONFLICT (content): Merge conflict in 
core/src/test/scala/unit/kafka/admin/AdminTest.scala
Removing core/src/test/scala/other/kafka/TestZKConsumerOffsets.scala
Removing core/src/test/scala/other/kafka/TestEndToEndLatency.scala
Auto-merging core/src/test/scala/kafka/tools/TestLogCleaning.scala
CONFLICT (content): Merge conflict in 
core/src/test/scala/kafka/tools/TestLogCleaning.scala
Auto-merging core/src/main/scala/kafka/utils/ZkUtils.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/utils/ZkUtils.scala
Auto-merging core/src/main/scala/kafka/utils/VerifiableProperties.scala
Removing core/src/main/scala/kafka/utils/Utils.scala
Auto-merging core/src/main/scala/kafka/utils/Throttler.scala
Removing core/src/main/scala/kafka/utils/Crc32.java
Auto-merging core/src/main/scala/kafka/tools/SimpleConsumerPerformance.scala
Auto-merging core/src/main/scala/kafka/tools/ProducerPerformance.scala
Auto-merging core/src/main/scala/kafka/tools/PerfConfig.scala
Auto-merging core/src/main/scala/kafka/tools/ConsoleConsumer.scala
Auto-merging core/src/main/scala/kafka/server/TopicConfigManager.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/server/TopicConfigManager.scala
Removing core/src/main/scala/kafka/server/RequestPurgatory.scala
Auto-merging core/src/main/scala/kafka/server/ReplicaManager.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/server/ReplicaManager.scala
Auto-merging core/src/main/scala/kafka/server/OffsetCheckpoint.scala
Removing core/src/main/scala/kafka/server/MessageSetSend.scala
Auto-merging core/src/main/scala/kafka/server/KafkaServer.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/server/KafkaServer.scala
Auto-merging core/src/main/scala/kafka/server/KafkaConfig.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/server/KafkaConfig.scala
Auto-merging core/src/main/scala/kafka/server/KafkaApis.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/server/KafkaApis.scala
Auto-merging core/src/main/scala/kafka/server/FetchDataInfo.scala
Removing core/src/main/scala/kafka/producer/KafkaLog4jAppender.scala
Removing core/src/main/scala/kafka/producer/ConsoleProducer.scala
Removing core/src/main/scala/kafka/network/Transmission.scala
Auto-merging core/src/main/scala/kafka/network/RequestChannel.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/network/RequestChannel.scala
Removing core/src/main/scala/kafka/network/BoundedByteBufferSend.scala
Removing core/src/main/scala/kafka/network/BoundedByteBufferReceive.scala
Auto-merging core/src/main/scala/kafka/log/LogManager.scala
Auto-merging core/src/main/scala/kafka/log/LogConfig.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/log/LogConfig.scala
Auto-merging core/src/main/scala/kafka/log/LogCleanerManager.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/log/LogCleanerManager.scala
Auto-merging core/src/main/scala/kafka/log/LogCleaner.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/log/LogCleaner.scala
Auto-merging core/src/main/scala/kafka/log/Log.scala
CONFLICT (content): Merge conflict in core/src/main/scala/kafka/log/Log.scala
Auto-merging core/src/main/scala/kafka/log/CleanerConfig.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/log/CleanerConfig.scala
Auto-merging core/src/main/scala/kafka/controller/TopicDeletionManager.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/controller/TopicDeletionManager.scala
Auto-merging core/src/main/scala/kafka/controller/ReplicaStateMachine.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/controller/ReplicaStateMachine.scala
Auto-merging core/src/main/scala/kafka/controller/PartitionStateMachine.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/controller/PartitionStateMachine.scala
Auto-merging core/src/main/scala/kafka/controller/KafkaController.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/controller/KafkaController.scala
Auto-merging core/src/main/scala/kafka/controller/ControllerChannelManager.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/controller/ControllerChannelManager.scala
Auto-merging 
core/src/main/scala/kafka/common/OffsetsLoadInProgressException.scala
Auto-merging 
core/src/main/scala/kafka/common/ConsumerRebalanceFailedException.scala
Auto-merging core/src/main/scala/kafka/cluster/Partition.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/cluster/Partition.scala
Auto-merging core/src/main/scala/kafka/api/TopicMetadata.scala
Auto-merging core/src/main/scala/kafka/api/LeaderAndIsrRequest.scala
Auto-merging core/src/main/scala/kafka/admin/TopicCommand.scala
CONFLICT (content): Merge conflict in 
core/src/main/scala/kafka/admin/TopicCommand.scala
Removing core/src/main/scala/kafka/admin/ShutdownBroker.scala
Removing core/src/main/scala/kafka/admin/DeleteTopicCommand.scala
Removing contrib/hadoop-producer/lib/piggybank.jar
Removing contrib/hadoop-consumer/lib/piggybank.jar
Auto-merging config/server.properties
CONFLICT (content): Merge conflict in config/server.properties
Auto-merging config/log4j.properties
Auto-merging clients/src/test/resources/log4j.properties
Auto-merging 
clients/src/test/java/org/apache/kafka/clients/producer/internals/BufferPoolTest.java
Removing clients/src/test/java/org/apache/kafka/clients/producer/SenderTest.java
Removing 
clients/src/test/java/org/apache/kafka/clients/producer/RecordAccumulatorTest.java
Removing 
clients/src/test/java/org/apache/kafka/clients/producer/PartitionerTest.java
Removing 
clients/src/test/java/org/apache/kafka/clients/producer/MetadataTest.java
Auto-merging 
clients/src/main/java/org/apache/kafka/common/errors/NotEnoughReplicasException.java
Removing 
clients/src/main/java/org/apache/kafka/clients/producer/internals/Partitioner.java
Removing 
clients/src/main/java/org/apache/kafka/clients/producer/internals/Metadata.java
Auto-merging build.gradle
CONFLICT (content): Merge conflict in build.gradle
CONFLICT (rename/delete): bin/windows/kafka-consumer-offset-checker.bat deleted 
in HEAD and renamed in fa03a7c6c48550f01176402139201af75d3836a2. Version 
fa03a7c6c48550f01176402139201af75d3836a2 of 
bin/windows/kafka-consumer-offset-checker.bat left in tree.
Auto-merging bin/kafka-run-class.sh
CONFLICT (content): Merge conflict in bin/kafka-run-class.sh
Auto-merging bin/kafka-replica-verification.sh
CONFLICT (rename/delete): bin/kafka-mirror-maker.sh deleted in HEAD and renamed 
in fa03a7c6c48550f01176402139201af75d3836a2. Version 
fa03a7c6c48550f01176402139201af75d3836a2 of bin/kafka-mirror-maker.sh left in 
tree.
CONFLICT (rename/delete): bin/kafka-consumer-offset-checker.sh deleted in HEAD 
and renamed in fa03a7c6c48550f01176402139201af75d3836a2. Version 
fa03a7c6c48550f01176402139201af75d3836a2 of 
bin/kafka-consumer-offset-checker.sh left in tree.
Auto-merging bin/kafka-consumer-groups.sh
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Removing .rat-excludes
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1435)
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1411)
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1407)
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1110)
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1120)
        at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:467)
        ... 17 more

Reply via email to