[zanata/zanata-server] e562bf: fix(merge translation): fix merge translation exce...

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: e562bf0e2c883ca9737c2e5521691d70c7c5019e
      https://github.com/zanata/zanata-server/commit/e562bf0e2c883ca9737c2e5521691d70c7c5019e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-04-06 (Wed, 06 Apr 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java

  Log Message:
  -----------
  fix(merge translation): fix merge translation exception with new translation

https://zanata.atlassian.net/browse/ZNTA-1013


  Commit: 0e69849c93562f087f06f4fc3c14eec6d830fb90
      https://github.com/zanata/zanata-server/commit/0e69849c93562f087f06f4fc3c14eec6d830fb90
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-04-06 (Wed, 06 Apr 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java

  Log Message:
  -----------
  Merge pull request #1132 from zanata/ZNTA-1013

fix(merge translation): fix merge translation exception with new translation


  Commit: b6f05af22f7e5bfbf60944a71fbdbfbfc642a0f8
      https://github.com/zanata/zanata-server/commit/b6f05af22f7e5bfbf60944a71fbdbfbfc642a0f8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-04-07 (Thu, 07 Apr 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java

  Log Message:
  -----------
  Merge branch 'release'


Compare: https://github.com/zanata/zanata-server/compare/fe3d2dfdd04f...b6f05af22f7e