See <https://buildhive.cloudbees.com/job/jclouds/job/jclouds/143/>
------------------------------------------ GitHub pull request #33 to jclouds/jclouds GitHub pull request #33 to jclouds/jclouds Building remotely on s-2c03e97e in workspace <https://buildhive.cloudbees.com/job/jclouds/job/jclouds/ws/> Checkout:jclouds / <https://buildhive.cloudbees.com/job/jclouds/job/jclouds/ws/> - hudson.remoting.Channel@57ae9bba:s-2c03e97e Using strategy: Build commits submitted for validated merge Last Built Revision: Revision a906f9f4ec2bbb58931076bfba118b51c9674c08 (origin/master) Fetching changes from 1 remote Git repository Fetching upstream changes from git://github.com/jclouds/jclouds.git Opening connection Done: 0 Counting objects Done: 292 Finding sources Done: 292 Getting sizes Done: 94 Compressing objects Done: 93 Writing objects Done: 292 remote: Resolving deltas Merging refs/tags/changes/143 FATAL: Could not merge refs/tags/changes/143 hudson.plugins.git.GitException: Could not merge refs/tags/changes/143 at hudson.plugins.git.GitAPI.merge(GitAPI.java:351) at com.cloudbees.jenkins.plugins.git.vmerge.BuildChooserImpl.getCandidateRevisions(BuildChooserImpl.java:94) at hudson.plugins.git.GitSCM$2.invoke(GitSCM.java:1170) at hudson.plugins.git.GitSCM$2.invoke(GitSCM.java:1059) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2154) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:287) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) 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:722) Caused by: hudson.plugins.git.GitException: Command "git merge refs/tags/changes/143" returned status code 1: stdout: Auto-merging providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/loaders/AWSEC2CreateSecurityGroupIfNeededTest.java CONFLICT (add/add): Merge conflict in providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/loaders/AWSEC2CreateSecurityGroupIfNeededTest.java Auto-merging providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/extensions/AWSEC2SecurityGroupExtensionLiveTest.java Auto-merging providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/loaders/AWSEC2CreateSecurityGroupIfNeeded.java CONFLICT (add/add): Merge conflict in providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/loaders/AWSEC2CreateSecurityGroupIfNeeded.java Auto-merging providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceDependenciesModule.java CONFLICT (content): Merge conflict in providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceDependenciesModule.java Auto-merging apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtensionLiveTest.java Removing apis/ec2/src/main/java/org/jclouds/ec2/domain/IpPermission.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java CONFLICT (content): Merge conflict in apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java CONFLICT (content): Merge conflict in apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java Automatic merge failed; fix conflicts and then commit the result. stderr: at hudson.plugins.git.GitAPI.launchCommandIn(GitAPI.java:779) at hudson.plugins.git.GitAPI.launchCommand(GitAPI.java:741) at hudson.plugins.git.GitAPI.launchCommand(GitAPI.java:751) at hudson.plugins.git.GitAPI.merge(GitAPI.java:349) ... 13 more
