[zanata/zanata-server] 6640b7: rhbz1000196 - Prevent copy trans from reusing tran...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 6640b7c2394915d660cb40ef165d76dc77256f1f
      https://github.com/zanata/zanata-server/commit/6640b7c2394915d660cb40ef165d76dc77256f1f
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-28 (Wed, 28 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java

  Log Message:
  -----------
  rhbz1000196 - Prevent copy trans from reusing translations from obsolete documents, iterations and projects.


  Commit: 686584c85bfac1007304a423157f11db12553d0d
      https://github.com/zanata/zanata-server/commit/686584c85bfac1007304a423157f11db12553d0d
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-28 (Wed, 28 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java

  Log Message:
  -----------
  Merge branch 'release' into integration/master

Conflicts:
	zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java


Compare: https://github.com/zanata/zanata-server/compare/055a8c0e5699...686584c85bfa