[zanata/zanata-api] 615e32: Merge TranslationStats with TranslationStatistics ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-api
  Commit: 615e32e715dc7f98244b95656ce3fdd0cbfa203f
      https://github.com/zanata/zanata-api/commit/615e32e715dc7f98244b95656ce3fdd0cbfa203f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-05-20 (Mon, 20 May 2013)

  Changed paths:
    A zanata-common-api/src/main/java/org/zanata/common/CommonContainerTranslationStatistics.java
    A zanata-common-api/src/main/java/org/zanata/common/TranslationStatistics.java
    M zanata-common-api/src/main/java/org/zanata/rest/dto/stats/ContainerTranslationStatistics.java
    R zanata-common-api/src/main/java/org/zanata/rest/dto/stats/TranslationStatistics.java

  Log Message:
  -----------
  Merge TranslationStats with TranslationStatistics object


  Commit: 0c8905699a2c4181e58e95b07dd4f1dffa8b9c48
      https://github.com/zanata/zanata-api/commit/0c8905699a2c4181e58e95b07dd4f1dffa8b9c48
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-05-20 (Mon, 20 May 2013)

  Changed paths:
    M zanata-common-api/src/main/java/org/zanata/common/AbstractTranslationCount.java
    M zanata-common-api/src/main/java/org/zanata/common/ContentState.java
    M zanata-common-api/src/main/java/org/zanata/common/TransUnitCount.java
    M zanata-common-api/src/main/java/org/zanata/common/TransUnitWords.java
    M zanata-common-api/src/main/java/org/zanata/common/TranslationStats.java

  Log Message:
  -----------
  Merge branch 'integration/master' of github.com:zanata/zanata-api into integration/master


  Commit: 25535119f815ab09a9c3059496dfb0a6286b51c8
      https://github.com/zanata/zanata-api/commit/25535119f815ab09a9c3059496dfb0a6286b51c8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-05-20 (Mon, 20 May 2013)

  Changed paths:
    M zanata-common-api/src/main/java/org/zanata/common/TranslationStatistics.java

  Log Message:
  -----------
  Partial commit for new stats


Compare: https://github.com/zanata/zanata-api/compare/11d89380c602...25535119f815