[zanata/zanata-server] 68ebef: rhbz953734 - push with AUTO merge handles new cont...

[GitHub]

  Branch: refs/heads/review-rhbz953734
  Home:   https://github.com/zanata/zanata-server
  Commit: 68ebef87f80d60c2af3d72011d08930b73303027
      https://github.com/zanata/zanata-server/commit/68ebef87f80d60c2af3d72011d08930b73303027
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-23 (Thu, 23 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  -----------
  rhbz953734 - push with AUTO merge handles new content state


  Commit: 848debd87cf5534b4be98e6eae53eee67dc8a60a
      https://github.com/zanata/zanata-server/commit/848debd87cf5534b4be98e6eae53eee67dc8a60a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-23 (Thu, 23 May 2013)

  Changed paths:
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/service/TranslationMergeService.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAutoNonReviewable.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAutoReviewable.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeImportNonReviewable.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeImportReviewable.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeServiceFactory.java
    A zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceTest.groovy
    A zanata-war/src/test/resources/org/zanata/service/impl/TranslationMergeService.html

  Log Message:
  -----------
  rhbz953734 - add concordion test for client push translation (incomplete cases)


Compare: https://github.com/zanata/zanata-server/compare/27d1b4756c5e...848debd87cf5