See <https://buildhive.cloudbees.com/job/jclouds/job/jclouds/1514/>
------------------------------------------
[...truncated 6 lines...]
Done: 0
Counting objects
Done: 0
Finding sources
Done: 0
Writing objects
Done: 0
remote: Updating references
Merging refs/tags/changes/1514
FATAL: Could not merge AnyObjectId[a4fa76e3ab85501ca6c9bc335f05bd34ed3311a9]
hudson.plugins.git.GitException: Could not merge
AnyObjectId[a4fa76e3ab85501ca6c9bc335f05bd34ed3311a9]
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
a4fa76e3ab85501ca6c9bc335f05bd34ed3311a9" returned status code 1:
stdout: Auto-merging skeletons/standalone-compute/pom.xml
CONFLICT (content): Merge conflict in skeletons/standalone-compute/pom.xml
Auto-merging skeletons/pom.xml
CONFLICT (content): Merge conflict in skeletons/pom.xml
Auto-merging scriptbuilder/pom.xml
CONFLICT (content): Merge conflict in scriptbuilder/pom.xml
Auto-merging resources/pom.xml
CONFLICT (content): Merge conflict in resources/pom.xml
Auto-merging providers/ultradns-ws/pom.xml
CONFLICT (content): Merge conflict in providers/ultradns-ws/pom.xml
Auto-merging providers/softlayer/pom.xml
CONFLICT (content): Merge conflict in providers/softlayer/pom.xml
Auto-merging providers/skalicloud-sdg-my/pom.xml
CONFLICT (content): Merge conflict in providers/skalicloud-sdg-my/pom.xml
Auto-merging providers/serverlove-z1-man/pom.xml
CONFLICT (content): Merge conflict in providers/serverlove-z1-man/pom.xml
Auto-merging providers/rackspace-cloudservers-us/pom.xml
CONFLICT (content): Merge conflict in
providers/rackspace-cloudservers-us/pom.xml
Auto-merging providers/rackspace-cloudservers-uk/pom.xml
CONFLICT (content): Merge conflict in
providers/rackspace-cloudservers-uk/pom.xml
Auto-merging providers/rackspace-cloudloadbalancers-us/pom.xml
CONFLICT (content): Merge conflict in
providers/rackspace-cloudloadbalancers-us/pom.xml
Auto-merging providers/rackspace-cloudloadbalancers-uk/pom.xml
CONFLICT (content): Merge conflict in
providers/rackspace-cloudloadbalancers-uk/pom.xml
Auto-merging providers/rackspace-clouddns-us/pom.xml
CONFLICT (content): Merge conflict in providers/rackspace-clouddns-us/pom.xml
Auto-merging providers/rackspace-clouddns-uk/pom.xml
CONFLICT (content): Merge conflict in providers/rackspace-clouddns-uk/pom.xml
Auto-merging providers/rackspace-clouddatabases-us/pom.xml
CONFLICT (content): Merge conflict in
providers/rackspace-clouddatabases-us/pom.xml
Auto-merging providers/rackspace-clouddatabases-uk/pom.xml
CONFLICT (content): Merge conflict in
providers/rackspace-clouddatabases-uk/pom.xml
Auto-merging providers/rackspace-cloudblockstorage-us/pom.xml
CONFLICT (content): Merge conflict in
providers/rackspace-cloudblockstorage-us/pom.xml
Auto-merging providers/rackspace-cloudblockstorage-uk/pom.xml
CONFLICT (content): Merge conflict in
providers/rackspace-cloudblockstorage-uk/pom.xml
Auto-merging providers/pom.xml
CONFLICT (content): Merge conflict in providers/pom.xml
Auto-merging providers/openhosting-east1/pom.xml
CONFLICT (content): Merge conflict in providers/openhosting-east1/pom.xml
Auto-merging providers/ninefold-storage/pom.xml
CONFLICT (content): Merge conflict in providers/ninefold-storage/pom.xml
Auto-merging providers/ninefold-compute/pom.xml
CONFLICT (content): Merge conflict in providers/ninefold-compute/pom.xml
Auto-merging providers/hpcloud-objectstorage/pom.xml
CONFLICT (content): Merge conflict in providers/hpcloud-objectstorage/pom.xml
Auto-merging providers/hpcloud-compute/pom.xml
CONFLICT (content): Merge conflict in providers/hpcloud-compute/pom.xml
Auto-merging providers/hpcloud-blockstorage/pom.xml
CONFLICT (content): Merge conflict in providers/hpcloud-blockstorage/pom.xml
Auto-merging providers/greenhousedata-element-vcloud/pom.xml
CONFLICT (content): Merge conflict in
providers/greenhousedata-element-vcloud/pom.xml
Auto-merging providers/gogrid/pom.xml
CONFLICT (content): Merge conflict in providers/gogrid/pom.xml
Auto-merging providers/go2cloud-jhb1/pom.xml
CONFLICT (content): Merge conflict in providers/go2cloud-jhb1/pom.xml
Auto-merging providers/glesys/pom.xml
CONFLICT (content): Merge conflict in providers/glesys/pom.xml
Auto-merging providers/elastichosts-tor-p/pom.xml
CONFLICT (content): Merge conflict in providers/elastichosts-tor-p/pom.xml
Auto-merging providers/elastichosts-syd-v/pom.xml
CONFLICT (content): Merge conflict in providers/elastichosts-syd-v/pom.xml
Auto-merging providers/elastichosts-sjc-c/pom.xml
CONFLICT (content): Merge conflict in providers/elastichosts-sjc-c/pom.xml
Auto-merging providers/elastichosts-sat-p/pom.xml
CONFLICT (content): Merge conflict in providers/elastichosts-sat-p/pom.xml
Auto-merging providers/elastichosts-lon-p/pom.xml
CONFLICT (content): Merge conflict in providers/elastichosts-lon-p/pom.xml
Auto-merging providers/elastichosts-lon-b/pom.xml
CONFLICT (content): Merge conflict in providers/elastichosts-lon-b/pom.xml
Auto-merging providers/elastichosts-lax-p/pom.xml
CONFLICT (content): Merge conflict in providers/elastichosts-lax-p/pom.xml
Auto-merging providers/elastichosts-hkg-e/pom.xml
CONFLICT (content): Merge conflict in providers/elastichosts-hkg-e/pom.xml
Auto-merging providers/elastichosts-ams-e/pom.xml
CONFLICT (content): Merge conflict in providers/elastichosts-ams-e/pom.xml
Auto-merging providers/dynect/pom.xml
CONFLICT (content): Merge conflict in providers/dynect/pom.xml
Auto-merging providers/cloudsigma-zrh/pom.xml
CONFLICT (content): Merge conflict in providers/cloudsigma-zrh/pom.xml
Auto-merging providers/cloudsigma-lvs/pom.xml
CONFLICT (content): Merge conflict in providers/cloudsigma-lvs/pom.xml
Auto-merging providers/cloudservers-us/pom.xml
CONFLICT (content): Merge conflict in providers/cloudservers-us/pom.xml
Auto-merging providers/cloudservers-uk/pom.xml
CONFLICT (content): Merge conflict in providers/cloudservers-uk/pom.xml
Auto-merging providers/cloudonestorage/pom.xml
CONFLICT (content): Merge conflict in providers/cloudonestorage/pom.xml
Auto-merging providers/cloudfiles-us/pom.xml
CONFLICT (content): Merge conflict in providers/cloudfiles-us/pom.xml
Auto-merging providers/cloudfiles-uk/pom.xml
CONFLICT (content): Merge conflict in providers/cloudfiles-uk/pom.xml
Auto-merging providers/bluelock-vcloud-zone01/pom.xml
CONFLICT (content): Merge conflict in providers/bluelock-vcloud-zone01/pom.xml
Auto-merging providers/azureblob/pom.xml
CONFLICT (content): Merge conflict in providers/azureblob/pom.xml
Auto-merging providers/aws-sts/pom.xml
CONFLICT (content): Merge conflict in providers/aws-sts/pom.xml
Auto-merging providers/aws-sqs/pom.xml
CONFLICT (content): Merge conflict in providers/aws-sqs/pom.xml
Auto-merging providers/aws-s3/pom.xml
CONFLICT (content): Merge conflict in providers/aws-s3/pom.xml
Auto-merging providers/aws-route53/pom.xml
CONFLICT (content): Merge conflict in providers/aws-route53/pom.xml
Auto-merging providers/aws-ec2/pom.xml
CONFLICT (content): Merge conflict in providers/aws-ec2/pom.xml
Auto-merging providers/aws-cloudwatch/pom.xml
CONFLICT (content): Merge conflict in providers/aws-cloudwatch/pom.xml
Auto-merging project/pom.xml
CONFLICT (content): Merge conflict in project/pom.xml
Auto-merging pom.xml
CONFLICT (content): Merge conflict in pom.xml
Auto-merging loadbalancer/pom.xml
CONFLICT (content): Merge conflict in loadbalancer/pom.xml
Auto-merging drivers/sshj/pom.xml
CONFLICT (content): Merge conflict in drivers/sshj/pom.xml
Auto-merging drivers/slf4j/pom.xml
CONFLICT (content): Merge conflict in drivers/slf4j/pom.xml
Auto-merging drivers/pom.xml
CONFLICT (content): Merge conflict in drivers/pom.xml
Auto-merging drivers/okhttp/pom.xml
CONFLICT (content): Merge conflict in drivers/okhttp/pom.xml
Auto-merging drivers/netty/pom.xml
CONFLICT (content): Merge conflict in drivers/netty/pom.xml
Auto-merging drivers/log4j/pom.xml
CONFLICT (content): Merge conflict in drivers/log4j/pom.xml
Auto-merging drivers/jsch/pom.xml
CONFLICT (content): Merge conflict in drivers/jsch/pom.xml
Auto-merging drivers/joda/pom.xml
CONFLICT (content): Merge conflict in drivers/joda/pom.xml
Auto-merging drivers/gae/pom.xml
CONFLICT (content): Merge conflict in drivers/gae/pom.xml
Auto-merging drivers/enterprise/pom.xml
CONFLICT (content): Merge conflict in drivers/enterprise/pom.xml
Auto-merging drivers/bouncycastle/pom.xml
CONFLICT (content): Merge conflict in drivers/bouncycastle/pom.xml
Auto-merging drivers/apachehc/pom.xml
CONFLICT (content): Merge conflict in drivers/apachehc/pom.xml
Auto-merging core/pom.xml
CONFLICT (content): Merge conflict in core/pom.xml
Auto-merging compute/pom.xml
CONFLICT (content): Merge conflict in compute/pom.xml
Auto-merging common/pom.xml
CONFLICT (content): Merge conflict in common/pom.xml
Auto-merging common/openstack/pom.xml
CONFLICT (content): Merge conflict in common/openstack/pom.xml
Auto-merging common/azure/pom.xml
CONFLICT (content): Merge conflict in common/azure/pom.xml
Auto-merging blobstore/pom.xml
CONFLICT (content): Merge conflict in blobstore/pom.xml
Auto-merging apis/vcloud/pom.xml
CONFLICT (content): Merge conflict in apis/vcloud/pom.xml
Auto-merging apis/swift/pom.xml
CONFLICT (content): Merge conflict in apis/swift/pom.xml
Auto-merging apis/sts/pom.xml
CONFLICT (content): Merge conflict in apis/sts/pom.xml
Auto-merging apis/sqs/pom.xml
CONFLICT (content): Merge conflict in apis/sqs/pom.xml
Auto-merging apis/s3/pom.xml
CONFLICT (content): Merge conflict in apis/s3/pom.xml
Auto-merging apis/route53/pom.xml
CONFLICT (content): Merge conflict in apis/route53/pom.xml
Auto-merging apis/rackspace-cloudloadbalancers/pom.xml
CONFLICT (content): Merge conflict in apis/rackspace-cloudloadbalancers/pom.xml
Auto-merging apis/rackspace-cloudidentity/pom.xml
CONFLICT (content): Merge conflict in apis/rackspace-cloudidentity/pom.xml
Auto-merging apis/rackspace-clouddns/pom.xml
CONFLICT (content): Merge conflict in apis/rackspace-clouddns/pom.xml
Auto-merging apis/pom.xml
CONFLICT (content): Merge conflict in apis/pom.xml
Auto-merging apis/openstack-trove/pom.xml
CONFLICT (content): Merge conflict in apis/openstack-trove/pom.xml
Auto-merging
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/options/NovaTemplateOptions.java
Auto-merging
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java
Auto-merging apis/openstack-nova/pom.xml
CONFLICT (content): Merge conflict in apis/openstack-nova/pom.xml
Auto-merging apis/openstack-nova-ec2/pom.xml
CONFLICT (content): Merge conflict in apis/openstack-nova-ec2/pom.xml
Auto-merging apis/openstack-keystone/pom.xml
CONFLICT (content): Merge conflict in apis/openstack-keystone/pom.xml
Auto-merging apis/openstack-cinder/pom.xml
CONFLICT (content): Merge conflict in apis/openstack-cinder/pom.xml
Auto-merging apis/filesystem/pom.xml
CONFLICT (content): Merge conflict in apis/filesystem/pom.xml
Auto-merging apis/elasticstack/pom.xml
CONFLICT (content): Merge conflict in apis/elasticstack/pom.xml
Auto-merging apis/ec2/pom.xml
CONFLICT (content): Merge conflict in apis/ec2/pom.xml
Auto-merging apis/cloudwatch/pom.xml
CONFLICT (content): Merge conflict in apis/cloudwatch/pom.xml
Auto-merging apis/cloudstack/pom.xml
CONFLICT (content): Merge conflict in apis/cloudstack/pom.xml
Auto-merging apis/cloudsigma/pom.xml
CONFLICT (content): Merge conflict in apis/cloudsigma/pom.xml
Auto-merging apis/cloudservers/pom.xml
CONFLICT (content): Merge conflict in apis/cloudservers/pom.xml
Auto-merging apis/cloudfiles/pom.xml
CONFLICT (content): Merge conflict in apis/cloudfiles/pom.xml
Auto-merging apis/byon/pom.xml
CONFLICT (content): Merge conflict in apis/byon/pom.xml
Auto-merging apis/atmos/pom.xml
CONFLICT (content): Merge conflict in apis/atmos/pom.xml
Auto-merging allloadbalancer/pom.xml
CONFLICT (content): Merge conflict in allloadbalancer/pom.xml
Auto-merging allcompute/pom.xml
CONFLICT (content): Merge conflict in allcompute/pom.xml
Auto-merging allblobstore/pom.xml
CONFLICT (content): Merge conflict in allblobstore/pom.xml
Auto-merging all/pom.xml
CONFLICT (content): Merge conflict in all/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
