[zanata/zanata-platform] 562929: fix: merge trans stops before completing (#711)

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-platform
  Commit: 5629292aa40bacbfdddc526a3d8c464b8a3bf203
      https://github.com/zanata/zanata-platform/commit/5629292aa40bacbfdddc526a3d8c464b8a3bf203
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-02-05 (Mon, 05 Feb 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java

  Log Message:
  -----------
  fix: merge trans stops before completing (#711)


  Commit: 3bdcda31f8e13ec04b101eda3de7b227abf93646
      https://github.com/zanata/zanata-platform/commit/3bdcda31f8e13ec04b101eda3de7b227abf93646
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-02-05 (Mon, 05 Feb 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java

  Log Message:
  -----------
  Merge commit '5629292aa40bacbfdddc526a3d8c464b8a3bf203' into HEAD


Compare: https://github.com/zanata/zanata-platform/compare/abf770cfdbbf...3bdcda31f8e1