brooklyn-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Jenkins Server <jenk...@builds.apache.org>
Subject Build failed in Jenkins: incubator-brooklyn-pull-requests #5
Date Wed, 01 Oct 2014 22:29:55 GMT
See <https://builds.apache.org/job/incubator-brooklyn-pull-requests/5/>

------------------------------------------
GitHub pull request #165 to apache/incubator-brooklyn
Building remotely on ubuntu-4 (Ubuntu ubuntu4 ubuntu) in workspace <https://builds.apache.org/job/incubator-brooklyn-pull-requests/ws/>
 > git rev-parse --is-inside-work-tree
Fetching changes from the remote Git repository
 > git config remote.origin.url git://github.com/apache/incubator-brooklyn.git
Fetching upstream changes from git://github.com/apache/incubator-brooklyn.git
 > git --version
 > git fetch --tags --progress git://github.com/apache/incubator-brooklyn.git +refs/heads/*:refs/remotes/origin/*
 > git config core.sparsecheckout
 > git checkout -f origin/master
 > git branch -a
 > git rev-parse master^{commit}
 > git rev-parse remotes/origin/0.4^{commit}
 > git rev-parse remotes/origin/0.4.0^{commit}
 > git rev-parse remotes/origin/0.4.0-M1^{commit}
 > git rev-parse remotes/origin/0.4.0-M2^{commit}
 > git rev-parse remotes/origin/0.4.0-rc.1^{commit}
 > git rev-parse remotes/origin/0.4.0-rc.2^{commit}
 > git rev-parse remotes/origin/0.5^{commit}
 > git rev-parse remotes/origin/0.5.0^{commit}
 > git rev-parse remotes/origin/0.5.0-M1^{commit}
 > git rev-parse remotes/origin/0.5.0-M2^{commit}
 > git rev-parse remotes/origin/0.5.0-rc.1^{commit}
 > git rev-parse remotes/origin/0.5.0-rc.2^{commit}
 > git rev-parse remotes/origin/0.6.0^{commit}
 > git rev-parse remotes/origin/0.6.0-M1^{commit}
 > git rev-parse remotes/origin/0.6.0-M2^{commit}
 > git rev-parse remotes/origin/0.6.0-rc.1^{commit}
 > git rev-parse remotes/origin/0.6.0-rc.2^{commit}
 > git rev-parse remotes/origin/0.6.0-rc.3^{commit}
 > git rev-parse remotes/origin/0.6.0-rc.4^{commit}
 > git rev-parse remotes/origin/0.6.x^{commit}
 > git rev-parse remotes/origin/0.7.0-M1^{commit}
 > git rev-parse remotes/origin/0.7.0-M1-amp-2.0.0-M1^{commit}
 > git rev-parse remotes/origin/feature/policy-persistence^{commit}
 > git rev-parse remotes/origin/feature/storage2^{commit}
 > git rev-parse remotes/origin/master^{commit}
 > git branch -D master
 > git checkout -b master origin/master
  Opening connection
    Done: 0
  Counting objects
    Done: 12
  Finding sources
    Done: 12
  Getting sizes
    Done: 11
  Compressing objects
    Done: 27990
  Writing objects
    Done: 12
  remote: Updating references
Merging refs/tags/changes/5
 > git rev-parse refs/tags/changes/5^{commit}
 > git merge 2a9ce5bc2dc632ad556d28eefb38335607b7d438
FATAL: Could not merge AnyObjectId[2a9ce5bc2dc632ad556d28eefb38335607b7d438]
hudson.plugins.git.GitException: Could not merge AnyObjectId[2a9ce5bc2dc632ad556d28eefb38335607b7d438]
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:446)
	at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:76)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:87)
	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:745)
Caused by: hudson.plugins.git.GitException: Command "git merge 2a9ce5bc2dc632ad556d28eefb38335607b7d438"
returned status code 1:
stdout: Auto-merging core/src/main/java/brooklyn/util/file/ArchiveUtils.java
CONFLICT (content): Merge conflict in core/src/main/java/brooklyn/util/file/ArchiveUtils.java
Auto-merging core/src/main/java/brooklyn/location/basic/SshMachineLocation.java
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1301)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1277)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1273)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1078)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1088)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:444)
	... 17 more

Mime
View raw message