See <https://builds.apache.org/job/brooklyn-master-windows/187/>
------------------------------------------ Started by upstream project "brooklyn-master-build" build number 292 originally caused by: Started by upstream project "brooklyn-server-master" build number 156 originally caused by: Started by an SCM change [EnvInject] - Loading node environment variables. Building remotely on windows-2012-1 (Windows) in workspace <https://builds.apache.org/job/brooklyn-master-windows/ws/> > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url > https://git-wip-us.apache.org/repos/asf/brooklyn.git # timeout=10 Fetching upstream changes from https://git-wip-us.apache.org/repos/asf/brooklyn.git > git --version # timeout=10 > git -c core.askpass=true fetch --tags --progress > https://git-wip-us.apache.org/repos/asf/brooklyn.git > +refs/heads/*:refs/remotes/origin/* > git rev-parse "origin/master^{commit}" # timeout=10 Checking out Revision e9ea4570b82ae6d41a9197d45ba576a173c1d275 (origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f e9ea4570b82ae6d41a9197d45ba576a173c1d275 > git rev-list e9ea4570b82ae6d41a9197d45ba576a173c1d275 # timeout=10 > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule update --init --recursive --remote [brooklyn-master-windows] $ cmd /c call C:\Windows\TEMP\hudson8028467701890630650.bat <https://builds.apache.org/job/brooklyn-master-windows/ws/>git> submodule foreach "git checkout master & git pull origin master" Entering 'brooklyn-client' Your branch is up-to-date with 'origin/master'. Already on 'master' >From https://github.com/apache/brooklyn-client * branch master -> FETCH_HEAD Already up-to-date. Entering 'brooklyn-dist' Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Previous HEAD position was f2c7112... This closes #39 Switched to branch 'master' >From https://github.com/apache/brooklyn-dist * branch master -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit f2c7112638a8154e3284b7f2947445646a5faa0c. error: Your local changes to the following files would be overwritten by merge: archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom archetypes/quickstart/src/brooklyn-sample/src/test/resources/sample.bom shared-packaging/src/test/yaml/package.bom vagrant/src/main/vagrant/files/vagrant-catalog.bom vagrant/src/main/vagrant/servers.yaml Please, commit your changes or stash them before you can merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff f2c7112638a8154e3284b7f2947445646a5faa0c output, run $ git reset --hard to recover. Stopping at 'brooklyn-dist'; script returned non-zero status. <https://builds.apache.org/job/brooklyn-master-windows/ws/>exit> 1 Build step 'Execute Windows batch command' marked build as failure
