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/06/24 23:21:34 UTC
Build failed in Jenkins: jclouds » jclouds #1279
See <https://buildhive.cloudbees.com/job/jclouds/job/jclouds/1279/>
------------------------------------------
GitHub pull request #419 to jclouds/jclouds
Building remotely on s-08efbb1d in workspace <https://buildhive.cloudbees.com/job/jclouds/job/jclouds/ws/>
Fetching changes from the remote Git repository
Fetching upstream changes from git://github.com/jclouds/jclouds.git
Opening connection
Done: 0
Counting objects
Done: 47
Finding sources
Done: 47
Getting sizes
Done: 36
Compressing objects
Done: 0
Writing objects
Done: 47
remote: Resolving deltas
remote: Updating references
Merging refs/tags/changes/1279
FATAL: Could not merge AnyObjectId[355fb52c63875771edce1309614271e0a2d2bf83]
hudson.plugins.git.GitException: Could not merge AnyObjectId[355fb52c63875771edce1309614271e0a2d2bf83]
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 355fb52c63875771edce1309614271e0a2d2bf83" returned status code 1:
stdout: Auto-merging compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
CONFLICT (content): Merge conflict in compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
Auto-merging compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java
CONFLICT (content): Merge conflict in compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java
Auto-merging compute/src/main/java/org/jclouds/compute/ComputeService.java
CONFLICT (content): Merge conflict in compute/src/main/java/org/jclouds/compute/ComputeService.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