See <https://builds.apache.org/job/incubator-brooklyn-pull-requests/4/>
------------------------------------------ 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/> Cloning the remote Git repository Cloning repository git://github.com/apache/incubator-brooklyn.git > git init <https://builds.apache.org/job/incubator-brooklyn-pull-requests/ws/> 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 remote.origin.url git://github.com/apache/incubator-brooklyn.git > git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/* > git config remote.origin.url git://github.com/apache/incubator-brooklyn.git Fetching upstream changes from git://github.com/apache/incubator-brooklyn.git > 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 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 checkout -b master origin/master Opening connection Done: 0 Counting objects Done: 163 Finding sources Done: 163 Getting sizes Done: 111 Compressing objects Done: 49009 Writing objects Done: 163 remote: Resolving deltas remote: Updating references Merging refs/tags/changes/4 > git rev-parse refs/tags/changes/4^{commit} > git merge 2e968dd8e6b67dbd598f007b02479dab88663b93 FATAL: Could not merge AnyObjectId[2e968dd8e6b67dbd598f007b02479dab88663b93] hudson.plugins.git.GitException: Could not merge AnyObjectId[2e968dd8e6b67dbd598f007b02479dab88663b93] 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 2e968dd8e6b67dbd598f007b02479dab88663b93" 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
