| CONSOLE OUTPUT |
| [...truncated 1873 lines...] |
| + [ -z true ] |
| + cd .. |
| + gitfa merge ondemand_current_tmp |
| + [ -d addons ] |
| + from_root=true |
| + gitf merge ondemand_current_tmp |
| + [ -d ./.git ] |
| + echo [.] |
| [.] |
| + cd . |
| + git merge ondemand_current_tmp |
| Already up-to-date. |
| + echo |
|
| + [ -d nuxeo-common/.git ] |
| + echo [nuxeo-common] |
| [nuxeo-common] |
| + cd nuxeo-common |
| + git merge ondemand_current_tmp |
| Already up-to-date. |
| + echo |
|
| + [ -d nuxeo-core/.git ] |
| + echo [nuxeo-core] |
| [nuxeo-core] |
| + cd nuxeo-core |
| + git merge ondemand_current_tmp |
| Already up-to-date. |
| + echo |
|
| + [ -d nuxeo-distribution/.git ] |
| + echo [nuxeo-distribution] |
| [nuxeo-distribution] |
| + cd nuxeo-distribution |
| + git merge ondemand_current_tmp |
| Already up-to-date. |
| + echo |
|
| + [ -d nuxeo-dm/.git ] |
| + echo [nuxeo-dm] |
| [nuxeo-dm] |
| + cd nuxeo-dm |
| + git merge ondemand_current_tmp |
| Merge made by the 'recursive' strategy. |
| .../resources/OSGI-INF/nxdirectories-contrib.xml | 12 + |
| .../src/main/resources/directories/locale.csv | 20 ++ |
| .../nuxeo/ecm/webapp/helpers/StartupHelper.java | 8 + |
| .../resources/OSGI-INF/directory-ui-contrib.xml | 2 + |
| .../src/main/resources/web/nuxeo.war/login.jsp | 89 +----- |
| .../web/nuxeo.war/scripts/detect_timezone.js | 301 ++++++++++++++++++++ |
| .../resources/web/nuxeo.war/scripts/nxtimezone.js | 41 +++ |
| 7 files changed, 389 insertions(+), 84 deletions(-) |
| create mode 100644 nuxeo-platform-default-config/src/main/resources/directories/locale.csv |
| create mode 100644 nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/scripts/detect_timezone.js |
| create mode 100644 nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/scripts/nxtimezone.js |
| + echo |
|
| + [ -d nuxeo-features/.git ] |
| + echo [nuxeo-features] |
| [nuxeo-features] |
| + cd nuxeo-features |
| + git merge ondemand_current_tmp |
| Already up-to-date. |
| + echo |
|
| + [ -d nuxeo-jsf/.git ] |
| + echo [nuxeo-jsf] |
| [nuxeo-jsf] |
| + cd nuxeo-jsf |
| + git merge ondemand_current_tmp |
| Auto-merging nuxeo-platform-webapp-base/src/main/java/org/nuxeo/ecm/webapp/helpers/EventNames.java |
| CONFLICT (content): Merge conflict in nuxeo-platform-webapp-base/src/main/java/org/nuxeo/ecm/webapp/helpers/EventNames.java |
| Automatic merge failed; fix conflicts and then commit the result. |
| Build step 'Execute shell' marked build as failure |
| Checking .*ERROR.* |
| Jenkins Text Finder: File set 'nuxeo-distribution/**/log/*.log' is empty |
| Recording test results |
| Publishing Selenium report... |
| [ci-game] evaluating rule: Build result |
| [ci-game] evaluating rule: Increased number of failed tests |
| [ci-game] evaluating rule: Increased number of passed tests |
| [ci-game] evaluating rule: Decreased number of failed tests |
| [ci-game] evaluating rule: Decreased number of passed tests |
| [ci-game] evaluating rule: Open HIGH priority tasks |
| [ci-game] evaluating rule: Open NORMAL priority tasks |
| [ci-game] evaluating rule: Open LOW priority tasks |
| [ci-game] evaluating rule: HIGH priority PMD warnings |
| [ci-game] evaluating rule: NORMAL priority PMD warnings |
| [ci-game] evaluating rule: LOW priority PMD warnings |
| [ci-game] evaluating rule: New HIGH priority Findbugs warnings |
| [ci-game] evaluating rule: New NORMAL priority Findbugs warnings |
| [ci-game] evaluating rule: New LOW priority Findbugs warnings |
| [ci-game] evaluating rule: Fixed HIGH priority Findbugs warnings |
| [ci-game] evaluating rule: Fixed NORMAL priority Findbugs warnings |
| [ci-game] evaluating rule: Fixed LOW priority Findbugs warnings |
| [ci-game] evaluating rule: Changed number of compiler warnings |
| [ci-game] evaluating rule: Changed number of checkstyle warnings |
| Email was triggered for: Failure |
| Sending email for trigger: Failure |
