[zanata/zanata-platform] 1f7f9c: Allow TM Merge (project version) to be cancelled

[GitHub]

  Branch: refs/heads/cancel-tm-merge
  Home:   https://github.com/zanata/zanata-platform
  Commit: 1f7f9cda18ed5ebe95e5d2ec233ebf79a1cb9d88
      https://github.com/zanata/zanata-platform/commit/1f7f9cda18ed5ebe95e5d2ec233ebf79a1cb9d88
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/TransMemoryMergeService.java
    M server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java

  Log Message:
  -----------
  Allow TM Merge (project version) to be cancelled



      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.