[zanata/zanata-platform] 5cc502: WIP

[GitHub]

  Branch: refs/heads/ZNTA-1865-version-tm-merge
  Home:   https://github.com/zanata/zanata-platform
  Commit: 5cc5021b885c468b75eba36267b6ac5c37f3ee5b
      https://github.com/zanata/zanata-platform/commit/5cc5021b885c468b75eba36267b6ac5c37f3ee5b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M server/zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java

  Log Message:
  -----------
  WIP