You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jclouds.apache.org by BuildHive <bu...@cloudbees.com> on 2013/05/20 20:03:06 UTC
Build failed in Jenkins: jclouds » jclouds-labs-openstack #25
See <https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs-openstack/25/>
------------------------------------------
GitHub pull request #1 to jclouds/jclouds-labs-openstack
Building remotely on s-739fb3bd in workspace <https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs-openstack/ws/>
Checkout:jclouds-labs-openstack / <https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs-openstack/ws/> - hudson.remoting.Channel@2ec80c35:s-739fb3bd
Using strategy: Build commits submitted for validated merge
Last Built Revision: Revision e26d4a91470f7218d645b14752ee3ee57e8736f4 (origin/master)
Fetching changes from 1 remote Git repository
Fetching upstream changes from git://github.com/jclouds/jclouds-labs-openstack.git
Opening connection
Done: 0
Counting objects
Done: 73
Finding sources
Done: 73
Getting sizes
Done: 21
Compressing objects
Done: 20
Writing objects
Done: 73
remote: Resolving deltas
Merging refs/tags/changes/25
FATAL: Could not merge refs/tags/changes/25
hudson.plugins.git.GitException: Could not merge refs/tags/changes/25
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/25" returned status code 1:
stdout: Auto-merging openstack-reddwarf/src/main/java/org/jclouds/openstack/reddwarf/v1/binders/BindCreateInstanceToJson.java
Auto-merging openstack-reddwarf/pom.xml
CONFLICT (content): Merge conflict in openstack-reddwarf/pom.xml
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
Jenkins build is back to normal : jclouds » jclouds-labs-openstack #26
Posted by BuildHive <bu...@cloudbees.com>.
See <https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs-openstack/26/>