[zanata/zanata] 0d9485: Merge HTextFlowContents back into HTextFlow.

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata
  Commit: 0d948590d0c225ba73e160a0b5af783f509d48fd
      https://github.com/zanata/zanata/commit/0d948590d0c225ba73e160a0b5af783f509d48fd
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.0.xml
    M zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    M zanata-war/src/test/java/org/zanata/model/HTextFlowJPATest.java

  Log Message:
  -----------
  Merge HTextFlowContents back into HTextFlow.


  Commit: 4bd19f631562c5b13ff905c6cdb09aa78a6dbcae
      https://github.com/zanata/zanata/commit/4bd19f631562c5b13ff905c6cdb09aa78a6dbcae
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.0.xml
    M zanata-war/src/test/java/org/zanata/service/impl/LockManagerServiceImplTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/CopyTransTestData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Merge HTextFlowTargetContents back into HTextFlowTarget.


Compare: https://github.com/zanata/zanata/compare/5a8cbec65922...4bd19f631562