[zanata/zanata-api] 10ba97: Add a new parameter includeAutomatedEntry to API g...

[GitHub]

  Branch: refs/heads/backport-includeAutomatedEntry
  Home:   https://github.com/zanata/zanata-api
  Commit: 10ba97f0c7a7261a6e92a5d21c8c3037884621de
      https://github.com/zanata/zanata-api/commit/10ba97f0c7a7261a6e92a5d21c8c3037884621de
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M zanata-common-api/src/main/java/org/zanata/rest/service/StatisticsResource.java

  Log Message:
  -----------
  Add a new parameter includeAutomatedEntry to API getContributionStatistic

Squashed commit of the following:

commit e4e7dcc3df0fd8bcb4fc7f8ec00097635e36cb82
Merge: 0d74a12 59d898c
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Nov 16 10:28:27 2015 +1000

    Merge branch 'integration/master' into automatedEntry

commit 0d74a12025bd342d1768b604ac559186dabda96a
Merge: 13e1f60 37fc45d
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Nov 12 10:49:30 2015 +1000

    Merge branch 'integration/master' into automatedEntry

commit 13e1f6010debe2357951c9d5694c9925fc125f1e
Author: daisy-ycguo <guoyingc at cn.ibm.com>
Date:   Thu Oct 29 16:27:24 2015 +0800

    Add a new parameter includeAutomatedEntry to API getContributionStatistic