See <https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs-openstack/1008/>
------------------------------------------ GitHub pull request #91 to jclouds/jclouds-labs-openstack Building remotely on s-7eb6ef7c in workspace <https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs-openstack/ws/> Fetching changes from the remote Git repository Fetching upstream changes from git://github.com/jclouds/jclouds-labs-openstack.git Opening connection Done: 0 Counting objects Done: 236 Finding sources Done: 236 Getting sizes Done: 179 Compressing objects Done: 32611 Writing objects Done: 236 remote: Resolving deltas remote: Updating references Merging refs/tags/changes/1008 FATAL: Could not merge AnyObjectId[0dd0f8384bc9aa129e1ff3592ca24da5dc1ec550] hudson.plugins.git.GitException: Could not merge AnyObjectId[0dd0f8384bc9aa129e1ff3592ca24da5dc1ec550] 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 0dd0f8384bc9aa129e1ff3592ca24da5dc1ec550" returned status code 1: stdout: Auto-merging pom.xml Auto-merging openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java CONFLICT (content): Merge conflict in openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java Auto-merging openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiMockTest.java Auto-merging openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiLiveTest.java CONFLICT (content): Merge conflict in openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiLiveTest.java Auto-merging openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java CONFLICT (content): Merge conflict in openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java Auto-merging openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiLiveTest.java CONFLICT (content): Merge conflict in openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiLiveTest.java Auto-merging openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java CONFLICT (content): Merge conflict in openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java Auto-merging openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiLiveTest.java CONFLICT (content): Merge conflict in openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiLiveTest.java Auto-merging openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java Auto-merging openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiLiveTest.java CONFLICT (content): Merge conflict in openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiLiveTest.java Auto-merging openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java CONFLICT (content): Merge conflict in openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java Auto-merging openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java CONFLICT (content): Merge conflict in openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java Auto-merging openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java CONFLICT (content): Merge conflict in openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java Auto-merging openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerLiveTest.java CONFLICT (content): Merge conflict in openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerLiveTest.java Auto-merging openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/reference/SwiftHeaders.java CONFLICT (add/add): Merge conflict in openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/reference/SwiftHeaders.java Auto-merging openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/options/CreateContainerOptions.java Auto-merging openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/handlers/SwiftErrorHandler.java Auto-merging openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java CONFLICT (content): Merge conflict in openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java Auto-merging openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/CopyObjectException.java CONFLICT (add/add): Merge conflict in openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/CopyObjectException.java Auto-merging openstack-swift/pom.xml 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
