Build failed in Jenkins: jclouds » jclouds #1911

[BuildHive <bu...@cloudbees.com>]

See <https://buildhive.cloudbees.com/job/jclouds/job/jclouds/1911/>

------------------------------------------
GitHub pull request #602 to jclouds/jclouds
Building remotely on s-545d3f99 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: 45
  Finding sources
    Done: 45
  Getting sizes
    Done: 41
  Compressing objects
    Done: 4376
  Writing objects
    Done: 45
  remote: Resolving deltas
  remote: Updating references
Merging refs/tags/changes/1911
FATAL: Could not merge AnyObjectId[d36c95b0e9ab86005f217b2de3be8b94b48883e6]
hudson.plugins.git.GitException: Could not merge AnyObjectId[d36c95b0e9ab86005f217b2de3be8b94b48883e6]
	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 d36c95b0e9ab86005f217b2de3be8b94b48883e6" returned status code 1:
stdout: Auto-merging apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiMockTest.java
CONFLICT (add/add): Merge conflict in apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiMockTest.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