See <https://buildhive.cloudbees.com/job/jclouds/job/jclouds/171/>
------------------------------------------ GitHub pull request #57 to jclouds/jclouds Building remotely on s-fae3fd16 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@16a7847d:s-fae3fd16 Using strategy: Build commits submitted for validated merge Last Built Revision: Revision 7778538534ca7c2ce574a4b81079f0486599f009 (master) Cloning the remote Git repository Cloning repository origin Fetching upstream changes from git://github.com/jclouds/jclouds.git Cleaning workspace Opening connection Done: 0 Counting objects Done: 1155 Finding sources Done: 1155 Getting sizes Done: 373 Compressing objects Done: 372 Writing objects Done: 1155 remote: Resolving deltas Merging refs/tags/changes/171 FATAL: Could not merge refs/tags/changes/171 hudson.plugins.git.GitException: Could not merge refs/tags/changes/171 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:724) Caused by: hudson.plugins.git.GitException: Command "git merge refs/tags/changes/171" returned status code 1: stdout: Auto-merging providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/SpotInstanceClient.java Auto-merging providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/PlacementGroupClient.java Auto-merging providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/MonitoringClient.java Auto-merging providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupClient.java Auto-merging providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSInstanceClient.java Auto-merging providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSAMIClient.java Auto-merging compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java Auto-merging apis/ec2/src/main/java/org/jclouds/ec2/services/WindowsClient.java Auto-merging apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupClient.java Auto-merging apis/ec2/src/main/java/org/jclouds/ec2/services/KeyPairClient.java Auto-merging apis/ec2/src/main/java/org/jclouds/ec2/services/InstanceClient.java Auto-merging apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticIPAddressClient.java Auto-merging apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticBlockStoreClient.java Auto-merging apis/ec2/src/main/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionClient.java Auto-merging apis/ec2/src/main/java/org/jclouds/ec2/services/AMIClient.java Auto-merging apis/ec2/src/main/java/org/jclouds/ec2/EC2Api.java CONFLICT (content): Merge conflict in apis/ec2/src/main/java/org/jclouds/ec2/EC2Api.java Auto-merging apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountClient.java Auto-merging apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.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
