[zanata/zanata-server] 72054b: Ignore intermittent test

GitHub noreply at github.com
Fri Feb 6 04:39:37 UTC 2015 

  Branch: refs/heads/rhbz1184708
  Home:   https://github.com/zanata/zanata-server
  Commit: 72054be5182a417ba30ab83d4e0c12b8c7a92108
      https://github.com/zanata/zanata-server/commit/72054be5182a417ba30ab83d4e0c12b8c7a92108
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java

  Log Message:
  -----------
  Ignore intermittent test


  Commit: a2afc86b1c13074c63cbeb9f831acac6bab0c9f7
      https://github.com/zanata/zanata-server/commit/a2afc86b1c13074c63cbeb9f831acac6bab0c9f7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: 32cf21550509986ce63476e44295784d32b17b3e
      https://github.com/zanata/zanata-server/commit/32cf21550509986ce63476e44295784d32b17b3e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M zanata-test-war/pom.xml

  Log Message:
  -----------
  Fix activation of functional-test profile in zanata-test-war


  Commit: 3b2474ef80a36490a5d08136af1c367e1d8d3a86
      https://github.com/zanata/zanata-server/commit/3b2474ef80a36490a5d08136af1c367e1d8d3a86
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M zanata-test-war/pom.xml

  Log Message:
  -----------
  Merge pull request #684 from zanata/functional-test-fixes

Fix activation of functional-test profile in zanata-test-war


  Commit: 1308b9da6f1ff267c4ea09fa20540dbe47f482de
      https://github.com/zanata/zanata-server/commit/1308b9da6f1ff267c4ea09fa20540dbe47f482de
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M zanata-test-war/pom.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release' into integration/master


  Commit: f374e740fe602175e5557460527271ed54b2fc3e
      https://github.com/zanata/zanata-server/commit/f374e740fe602175e5557460527271ed54b2fc3e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java

  Log Message:
  -----------
  Implement myTrans options when upload translation
https://bugzilla.redhat.com/show_bug.cgi?id=1184299

Squashed commit of the following:

commit 573fc4182e8113a9d98923fe0b64d7e1ad8697f3
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Feb 6 07:12:00 2015 +1000

    Fix unit test

commit 31a614edb0eda39858bf3094592b26c8c994adc1
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 5 15:17:04 2015 +1000

    Update zanata-api version to 3.7.0-SNAPSHOT

commit 5e6d63127c3dea1ef379c72dba88ca664783a61c
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 5 14:07:42 2015 +1000

    Fix test for pushing translations

commit 15bdc2efbdc65a9e06e54fdd5f6bae72f99e81b4
Merge: ebd1d43 b4b3c38
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 5 11:30:43 2015 +1000

    Merge branch 'integration/master' into rhbz1184299

    Conflicts:
    	zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml

commit ebd1d43ede7ca44611c1110cc31c6f1d801c233d
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Feb 2 12:55:41 2015 +1000

    Fix unit test

commit dffc9aefc4f0aae823effb76e2ac15ed19f1fb41
Merge: 5abeaad cc96b2f
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jan 30 12:12:20 2015 +1000

    Merge branch 'integration/master' into rhbz1184299

commit 5abeaad65f116fccb19423a7a6eeb1df9f6eeaaa
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Jan 28 15:56:13 2015 +1000

    Implement myTrans options when upload translation

    https://bugzilla.redhat.com/show_bug.cgi?id=1184299


  Commit: f147b27487715611901dc45aa45417fc31712919
      https://github.com/zanata/zanata-server/commit/f147b27487715611901dc45aa45417fc31712919
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' into rhbz1184708


  Commit: 55ce2ef8d37ce4936f742225902cb20e66ca9fc8
      https://github.com/zanata/zanata-server/commit/55ce2ef8d37ce4936f742225902cb20e66ca9fc8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

  Log Message:
  -----------
  Implement override plural forms: https://bugzilla.redhat.com/show_bug.cgi?id=1184708


Compare: https://github.com/zanata/zanata-server/compare/d42e58ff84ac...55ce2ef8d37c

More information about the zanata-commits mailing list