You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jclouds.apache.org by BuildHive <bu...@cloudbees.com> on 2014/10/06 08:45:26 UTC
Build failed in Jenkins: jclouds » jclouds #1722
See <https://buildhive.cloudbees.com/job/jclouds/job/jclouds/1722/>
------------------------------------------
GitHub pull request #553 to jclouds/jclouds
GitHub pull request #554 to jclouds/jclouds
Building remotely on s-2514e937 in workspace <https://buildhive.cloudbees.com/job/jclouds/job/jclouds/ws/>
Deleting this stale workspace
Cloning the remote Git repository
Cloning repository git://github.com/jclouds/jclouds.git
git --version
git version 1.7.11.7
Opening connection
Done: 0
Counting objects
Done: 356
Finding sources
Done: 356
Getting sizes
Done: 325
Compressing objects
Done: 247209
Writing objects
Done: 356
remote: Resolving deltas
remote: Updating references
Merging refs/tags/changes/1722
FATAL: Could not merge AnyObjectId[b078248150b016d1ff25c20d94cb1dedc862a822]
hudson.plugins.git.GitException: Could not merge AnyObjectId[b078248150b016d1ff25c20d94cb1dedc862a822]
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$2.execute(CliGitAPIImpl.java:315)
at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:63)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:47)
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:299)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:280)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:239)
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:744)
Caused by: hudson.plugins.git.GitException: Command "merge b078248150b016d1ff25c20d94cb1dedc862a822" returned status code 1:
stdout: Auto-merging drivers/gae/src/test/java/org/jclouds/gae/GaeHttpCommandExecutorServiceIntegrationTest.java
Removing drivers/gae/src/main/java/org/jclouds/gae/config/MultithreadedAsyncGoogleAppEngineConfigurationModule.java
Removing drivers/gae/src/main/java/org/jclouds/gae/config/AsyncGoogleAppEngineConfigurationModule.java
Removing drivers/gae/src/main/java/org/jclouds/gae/AsyncGaeHttpCommandExecutorService.java
Auto-merging core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java
CONFLICT (content): Merge conflict in core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java
Auto-merging core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java
Auto-merging core/src/test/java/org/jclouds/rest/annotationparsing/ClosableApiTest.java
Auto-merging core/src/main/java/org/jclouds/ContextBuilder.java
Auto-merging apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java
CONFLICT (content): Merge conflict in apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java
Automatic merge failed; fix conflicts and then commit the result.
stderr:
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:928)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:909)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:853)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:863)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$2.execute(CliGitAPIImpl.java:313)
... 17 more