[zanata/zanata-client] a89104: [mvn-release-plugin] Prepare for next development ...

Tue Jun 16 02:50:40 UTC 2015

  Branch: refs/heads/release
  Home:   https://github.com/zanata/zanata-client
  Commit: a89104d4db06405267317d07fe7ab0f57df0b999
      https://github.com/zanata/zanata-client/commit/a89104d4db06405267317d07fe7ab0f57df0b999
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    M pom.xml
    M zanata-cli/pom.xml
    M zanata-client-commands/pom.xml
    M zanata-maven-plugin/pom.xml
    M zanata-rest-client/pom.xml

  Log Message:
  -----------
  [mvn-release-plugin] Prepare for next development iteration.

  Commit: 8b70808eaa4aca96bd555cf7f2bda676d8f35036
      https://github.com/zanata/zanata-client/commit/8b70808eaa4aca96bd555cf7f2bda676d8f35036
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Log Message:
  -----------
  Merge branch 'release' into master.

Merged with -s ours to prevent release versions overwriting master versions.

  Commit: 8dbf5ecb8d3de6d1efc15897b38a60524a98cf46
      https://github.com/zanata/zanata-client/commit/8dbf5ecb8d3de6d1efc15897b38a60524a98cf46
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/UnqualifiedSrcDocName.java

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

  Commit: b63d92dd77bf86e4d6b979be8a2d49e62e0f53a3
      https://github.com/zanata/zanata-client/commit/b63d92dd77bf86e4d6b979be8a2d49e62e0f53a3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M zanata-cli/src/main/java/org/zanata/client/ZanataClient.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtility.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ClientUtilityTest.java

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

  Commit: 80c16a1cacae082f703fe92b8a4651091bf7f61a
      https://github.com/zanata/zanata-client/commit/80c16a1cacae082f703fe92b8a4651091bf7f61a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Travis: enable static analysis; resolve dependencies earlier

  Commit: 17709fa0c5928e28bd67dd23fb9694814c8fe6db
      https://github.com/zanata/zanata-client/commit/17709fa0c5928e28bd67dd23fb9694814c8fe6db
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Try to speed up Travis builds a little

  Commit: 167ef743ad24e8c17745c1d44c5725dc81b48e92
      https://github.com/zanata/zanata-client/commit/167ef743ad24e8c17745c1d44c5725dc81b48e92
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    A .travis-settings.xml
    M .travis.yml
    R settings.xml

  Log Message:
  -----------
  Disable dependency prefetch, rename settings.xml to .travis-settings.xml

  Commit: 1d992f87ae34158aad1c26194fff7d4848780253
      https://github.com/zanata/zanata-client/commit/1d992f87ae34158aad1c26194fff7d4848780253
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

  Changed paths:
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullCommand.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptions.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptionsImpl.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushCommand.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptions.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/gettext/PublicanUtil.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PublicanPullCommandTest.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/push/PublicanPushCommandTest.java
    R zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
    R zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java

  Log Message:
  -----------
  remove deprecated publican push and pull commands

  Commit: 8257ff3c447ae47296690b8c8439bb1a537b502a
      https://github.com/zanata/zanata-client/commit/8257ff3c447ae47296690b8c8439bb1a537b502a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

  Changed paths:
    A mock-server/pom.xml
    A mock-server/src/main/java/org/zanata/rest/service/MockAccountResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockCopyTransResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockGlossaryResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockProjectIterationResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockProjectResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockProjectsResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockResourceUtil.java
    A mock-server/src/main/java/org/zanata/rest/service/MockResourcesApplication.java
    A mock-server/src/main/java/org/zanata/rest/service/MockServerRule.java
    A mock-server/src/main/java/org/zanata/rest/service/MockSourceDocResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockStatisticsResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockVersionResource.java
    M pom.xml
    A rest-client/pom.xml
    A rest-client/src/main/java/org/zanata/ManualTest.java
    A rest-client/src/main/java/org/zanata/rest/client/AccountClient.java
    A rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderFilter.java
    A rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    A rest-client/src/main/java/org/zanata/rest/client/CacheResponseFilter.java
    A rest-client/src/main/java/org/zanata/rest/client/ClientUtil.java
    A rest-client/src/main/java/org/zanata/rest/client/CopyTransClient.java
    A rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    A rest-client/src/main/java/org/zanata/rest/client/GlossaryClient.java
    A rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    A rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java
    A rest-client/src/main/java/org/zanata/rest/client/ProjectsClient.java
    A rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java
    A rest-client/src/main/java/org/zanata/rest/client/SourceDocResourceClient.java
    A rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java
    A rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java
    A rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    A rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/CopyTransClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/MockServerTestUtil.java
    A rest-client/src/test/java/org/zanata/rest/client/ProjectClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/ProjectsClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/RestClientFactoryTest.java
    A rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java
    A rest-client/src/test/resources/log4j.xml
    A rest-client/src/test/resources/test-odt.odt
    A rest-client/src/test/resources/zh-CN/test-odt.odt
    M zanata-client-commands/src/test/java/org/zanata/client/TestProjectGenerator.java
    A zanata-client-commands/src/test/java/org/zanata/client/integraion/FileProjectITCase.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/ClientUtilityTest.java
    A zanata-rest-client/src/test/resources/test-odt.odt
    A zanata-rest-client/src/test/resources/zh-CN/test-odt.odt

  Log Message:
  -----------
  create mock zanata rest server

  Commit: 85bbade80857ef09de08a598dc99872f128f6f0a
      https://github.com/zanata/zanata-client/commit/85bbade80857ef09de08a598dc99872f128f6f0a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-11-18 (Tue, 18 Nov 2014)

  Changed paths:
    R rest-client/pom.xml
    R rest-client/src/main/java/org/zanata/ManualTest.java
    R rest-client/src/main/java/org/zanata/rest/client/AccountClient.java
    R rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderFilter.java
    R rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    R rest-client/src/main/java/org/zanata/rest/client/CacheResponseFilter.java
    R rest-client/src/main/java/org/zanata/rest/client/ClientUtil.java
    R rest-client/src/main/java/org/zanata/rest/client/CopyTransClient.java
    R rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    R rest-client/src/main/java/org/zanata/rest/client/GlossaryClient.java
    R rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    R rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java
    R rest-client/src/main/java/org/zanata/rest/client/ProjectsClient.java
    R rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java
    R rest-client/src/main/java/org/zanata/rest/client/SourceDocResourceClient.java
    R rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java
    R rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java
    R rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    R rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/CopyTransClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/MockServerTestUtil.java
    R rest-client/src/test/java/org/zanata/rest/client/ProjectClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/ProjectsClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/RestClientFactoryTest.java
    R rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java
    R rest-client/src/test/resources/log4j.xml
    R rest-client/src/test/resources/test-odt.odt
    R rest-client/src/test/resources/zh-CN/test-odt.odt
    M zanata-rest-client/pom.xml
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AccountClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderDecorator.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderFilter.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/CacheResponseFilter.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtil.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtility.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/CopyTransClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/GlossaryClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ITranslationResourcesFactory.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectsClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/SourceDocResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugInterceptor.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java
    R zanata-rest-client/src/test/java/org/zanata/rest/client/ClientUtilityTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/CopyTransClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/MockServerTestUtil.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectsClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/RestClientFactoryTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java

  Log Message:
  -----------
  move new client back to zanata-rest-client module

  Commit: 354594150a101b5a49a5ab8735af9e5b6f5e6eb5
      https://github.com/zanata/zanata-client/commit/354594150a101b5a49a5ab8735af9e5b6f5e6eb5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M mock-server/pom.xml
    M mock-server/src/main/java/org/zanata/rest/service/MockStatisticsResource.java
    M pom.xml
    M zanata-cli/src/test/java/org/zanata/client/ClientToServerTest.java
    M zanata-client-commands/pom.xml
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ListLocalCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/UpdateChecker.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/InitCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectIterationPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/SourceConfigPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/TransConfigPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/OfflinePoStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/stats/GetStatisticsCommand.java
    R zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    A zanata-client-commands/src/test/java/org/zanata/client/MockitoServerRule.java
    M zanata-client-commands/src/test/java/org/zanata/client/TestProjectGenerator.java
    M zanata-client-commands/src/test/java/org/zanata/client/TestUtils.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/HTTPMockContainer.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/InitCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectIterationPromptTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectPromptTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/XliffPushStrategyTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/config/ConfigUtilTest.java
    R zanata-client-commands/src/test/java/org/zanata/client/integraion/FileProjectITCase.java
    M zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullFileProjectITCase.java
    M zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullGettextITCase.java
    M zanata-rest-client/pom.xml
    M zanata-rest-client/src/main/java/org/zanata/rest/client/AccountClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/CacheResponseFilter.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtil.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtility.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/CopyTransClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/GlossaryClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectsClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/SourceDocResourceClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java

  Log Message:
  -----------
  remove resteasy dependency and switch to new client

  Commit: 8eb617005432e6a7ecf7f3693919e7ff2e68055d
      https://github.com/zanata/zanata-client/commit/8eb617005432e6a7ecf7f3693919e7ff2e68055d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    M mock-server/pom.xml
    M pom.xml
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteCommand.java
    M zanata-rest-client/pom.xml
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderFilter.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    R zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderFilterTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/CopyTransClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectsClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/RestClientFactoryTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java

  Log Message:
  -----------
  rhbz1124630 - fix according review comments

  Commit: 9c6ea3e91de9d96b23f285d35840ecf60c60d104
      https://github.com/zanata/zanata-client/commit/9c6ea3e91de9d96b23f285d35840ecf60c60d104
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    R mock-server/pom.xml
    R mock-server/src/main/java/org/zanata/rest/service/MockAccountResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockCopyTransResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockGlossaryResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockProjectIterationResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockProjectResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockProjectsResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockResourceUtil.java
    R mock-server/src/main/java/org/zanata/rest/service/MockResourcesApplication.java
    R mock-server/src/main/java/org/zanata/rest/service/MockServerRule.java
    R mock-server/src/main/java/org/zanata/rest/service/MockSourceDocResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockStatisticsResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockVersionResource.java
    M pom.xml
    A stub-server/pom.xml
    A stub-server/src/main/java/org/zanata/rest/service/MockAccountResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockCopyTransResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockGlossaryResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectIterationResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectsResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockResourceUtil.java
    A stub-server/src/main/java/org/zanata/rest/service/MockResourcesApplication.java
    A stub-server/src/main/java/org/zanata/rest/service/MockSourceDocResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockStatisticsResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockVersionResource.java
    A stub-server/src/main/java/org/zanata/rest/service/StubbingServerRule.java
    M zanata-rest-client/pom.xml
    M zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/CopyTransClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectsClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/RestClientFactoryTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java

  Log Message:
  -----------
  rhbz1124630 - rename mock-server module to stub-server

  Commit: 31a21853d3ca837ed078ad1887c710f933578dbb
      https://github.com/zanata/zanata-client/commit/31a21853d3ca837ed078ad1887c710f933578dbb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    A zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    R zanata-client-commands/src/test/java/org/zanata/client/MockitoServerRule.java
    M zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullFileProjectITCase.java
    M zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullGettextITCase.java

  Log Message:
  -----------
  rename MockitoServerRule to MockServerRule

  Commit: ffcc07caa662d87b7d801703b808d2d03ee2469d
      https://github.com/zanata/zanata-client/commit/ffcc07caa662d87b7d801703b808d2d03ee2469d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M stub-server/pom.xml

  Log Message:
  -----------
  rhbz1124630 - remove find-duplicate skip and control httpcomponent version

  Commit: eec55675829ea6d53a719645837c50d2cad112d4
      https://github.com/zanata/zanata-client/commit/eec55675829ea6d53a719645837c50d2cad112d4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-05 (Fri, 05 Dec 2014)

  Changed paths:
    M zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtil.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/CopyTransClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java

  Log Message:
  -----------
  rhbz1124630 - use explicit path construction

- jersey can not handle path template with regex in path param
- extra url prefix (i.e. rest) will get appended twice using previous method

  Commit: 8fee4de63b6c5b414c96c747255f8eb683e201cc
      https://github.com/zanata/zanata-client/commit/8fee4de63b6c5b414c96c747255f8eb683e201cc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-10 (Wed, 10 Dec 2014)

  Changed paths:
    M pom.xml
    A stub-server/pom.xml
    A stub-server/src/main/java/org/zanata/rest/service/MockAccountResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockCopyTransResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockGlossaryResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectIterationResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectsResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockResourceUtil.java
    A stub-server/src/main/java/org/zanata/rest/service/MockResourcesApplication.java
    A stub-server/src/main/java/org/zanata/rest/service/MockSourceDocResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockStatisticsResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockVersionResource.java
    A stub-server/src/main/java/org/zanata/rest/service/StubbingServerRule.java
    M zanata-cli/src/test/java/org/zanata/client/ClientToServerTest.java
    M zanata-client-commands/pom.xml
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ListLocalCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullCommand.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptions.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptionsImpl.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushCommand.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptions.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/UpdateChecker.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/gettext/PublicanUtil.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/InitCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectIterationPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/SourceConfigPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/TransConfigPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/OfflinePoStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/stats/GetStatisticsCommand.java
    M zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M zanata-client-commands/src/test/java/org/zanata/client/TestProjectGenerator.java
    M zanata-client-commands/src/test/java/org/zanata/client/TestUtils.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/HTTPMockContainer.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/InitCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectIterationPromptTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectPromptTest.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PublicanPullCommandTest.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/push/PublicanPushCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/XliffPushStrategyTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/config/ConfigUtilTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullFileProjectITCase.java
    M zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullGettextITCase.java
    R zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
    R zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java
    M zanata-rest-client/pom.xml
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AccountClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderDecorator.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderFilter.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/CacheResponseFilter.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtil.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtility.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/CopyTransClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/GlossaryClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ITranslationResourcesFactory.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectsClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/SourceDocResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugInterceptor.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    R zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderFilterTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java
    R zanata-rest-client/src/test/java/org/zanata/rest/client/ClientUtilityTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/CopyTransClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/MockServerTestUtil.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectsClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/RestClientFactoryTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java
    A zanata-rest-client/src/test/resources/test-odt.odt
    A zanata-rest-client/src/test/resources/zh-CN/test-odt.odt

  Log Message:
  -----------
  Merge pull request #37 from zanata/jersey-boys

Rhbz1124630 - remove RESTEasy dependency from client

  Commit: 6c2099ddc2e0d001102c1a700e7b01f1b958de1a
      https://github.com/zanata/zanata-client/commit/6c2099ddc2e0d001102c1a700e7b01f1b958de1a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  Changed paths:
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java

  Log Message:
  -----------
  rhbz1124630 - need to override accept header for some clients to work

  Commit: 93fb090782b855d56fa0f663d6f30e5c1d32eb01
      https://github.com/zanata/zanata-client/commit/93fb090782b855d56fa0f663d6f30e5c1d32eb01
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-15 (Mon, 15 Dec 2014)

  Changed paths:
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java

  Log Message:
  -----------
  Merge pull request #39 from zanata/rhbz1124630-jersey

rhbz1124630 - need to override accept header for some clients to work

  Commit: c417014347e2ad948f3862458a895cdd02790770
      https://github.com/zanata/zanata-client/commit/c417014347e2ad948f3862458a895cdd02790770
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-17 (Wed, 17 Dec 2014)

  Changed paths:
    M zanata-cli/etc/scripts/zanata-cli

  Log Message:
  -----------
  make the script work when you symlinked it

  Commit: 1fbfeacd6d59f1b419d16f5bfe351678fc8e7db7
      https://github.com/zanata/zanata-client/commit/1fbfeacd6d59f1b419d16f5bfe351678fc8e7db7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-23 (Tue, 23 Dec 2014)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/AbstractGettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/GettextDirStrategyTest.java

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

Conflicts:
	zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java

  Commit: 5e30fc97234c66d1f024ddd9e0549c3bc82ce436
      https://github.com/zanata/zanata-client/commit/5e30fc97234c66d1f024ddd9e0549c3bc82ce436
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/InitCommand.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/InitCommandTest.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AcceptTypeFilter.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java

  Log Message:
  -----------
  rhbz1124630 - need to add header for all requests

  Commit: 69bb0eab286c3bf4e88004bade27e08732878150
      https://github.com/zanata/zanata-client/commit/69bb0eab286c3bf4e88004bade27e08732878150
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-01-07 (Wed, 07 Jan 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectIterationPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectPrompt.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectIterationPromptTest.java

  Log Message:
  -----------
  set project type when selecting version in zanata init

  Commit: 5b902fd37cd7cf0064f197f72cb66aa9608fdfb2
      https://github.com/zanata/zanata-client/commit/5b902fd37cd7cf0064f197f72cb66aa9608fdfb2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-01-07 (Wed, 07 Jan 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/InitCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectIterationPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectPrompt.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/InitCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectIterationPromptTest.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AcceptTypeFilter.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java

  Log Message:
  -----------
  Merge pull request #43 from zanata/fix-jersey-change

rhbz1124630 - need to add header for all requests

  Commit: da08157c982dd4f133ee3b43ccf6f5948c313b1b
      https://github.com/zanata/zanata-client/commit/da08157c982dd4f133ee3b43ccf6f5948c313b1b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M zanata-cli/etc/scripts/zanata-cli

  Log Message:
  -----------
  Merge pull request #41 from zanata/symlink-works

make the script work when you symlinked it

  Commit: 0e84b877726a446664fb2b07cc1619f2371eb1bb
      https://github.com/zanata/zanata-client/commit/0e84b877726a446664fb2b07cc1619f2371eb1bb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M zanata-cli/src/main/java/org/zanata/client/ZanataClient.java
    M zanata-cli/src/test/java/org/zanata/client/HTTPMockContainer.java
    M zanata-cli/src/test/java/org/zanata/client/ZanataClientTest.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/UpdateChecker.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/SourceConfigPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/stats/GetStatisticsCommand.java
    M zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/OptionsUtilTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectPromptTest.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/PushSimpleMojo.java

  Log Message:
  -----------
  Squashed commit of the following:

commit 259510ced07390eb38bd830651cddf1a75954ed4
Merge: fdbdd25 5b902fd
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Jan 14 10:46:48 2015 +1000

    Merge remote-tracking branch 'origin/master' into fix-formatting

    Conflicts:
    	zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    	zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    	zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtility.java
    	zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugInterceptor.java

commit fdbdd25198f8565f633c62f55f8c4ec95d810524
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Dec 5 15:23:28 2014 +1000

    Update zanata-parent

commit 97d9ac922fd66e704ebc2dd29e0d9b5647e60259
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Dec 5 11:41:39 2014 +1000

    Fix formatting

  Commit: dfa4a00077f7906401022bfb807e50d050c6b9ca
      https://github.com/zanata/zanata-client/commit/dfa4a00077f7906401022bfb807e50d050c6b9ca
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M zanata-client-commands/src/test/java/org/zanata/client/TestProjectGenerator.java

  Log Message:
  -----------
  Fix formatting

  Commit: 5823a762ba6a28311cb39e41bc9ab458047224ae
      https://github.com/zanata/zanata-client/commit/5823a762ba6a28311cb39e41bc9ab458047224ae
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    A docs/commands/init.md
    A docs/commands/pull.md
    A docs/commands/push.md
    A docs/configuration.md
    A docs/images/302-user-settings.png
    A docs/images/350-version-config-file.png
    A docs/index.md
    A docs/installation.md
    A docs/maven-plugin/commands.md
    A docs/maven-plugin/configuration.md
    A docs/maven-plugin/installation.md
    A mkdocs.yml

  Log Message:
  -----------
  Add Read the docs documentation.

Currently uses the default readthedocs theme, but can be customized with our own theme. This is an almost exact copy of the content on zanata.org/help that relates to the client.

  Commit: abb8fcda232058a4560526fccc93f9f69d194bde
      https://github.com/zanata/zanata-client/commit/abb8fcda232058a4560526fccc93f9f69d194bde
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    A docs/commands/init.md
    A docs/commands/pull.md
    A docs/commands/push.md
    A docs/configuration.md
    A docs/images/302-user-settings.png
    A docs/images/350-version-config-file.png
    A docs/index.md
    A docs/installation.md
    A docs/maven-plugin/commands.md
    A docs/maven-plugin/configuration.md
    A docs/maven-plugin/installation.md
    A mkdocs.yml

  Log Message:
  -----------
  Merge pull request #44 from zanata/readthedocs

Add Read the docs documentation.

  Commit: 5c6712298a6ff1053a535fb142f8ba2a0070f81a
      https://github.com/zanata/zanata-client/commit/5c6712298a6ff1053a535fb142f8ba2a0070f81a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Add intelliJ file in git ignore

  Commit: b289753d012a49ad210ead629fd747330d297963
      https://github.com/zanata/zanata-client/commit/b289753d012a49ad210ead629fd747330d297963
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Merge pull request #45 from zanata/add-intelliJ-ignore

Add intelliJ file in git ignore

  Commit: d47e176e9223be0a0d0d12027a8a1a9df69439f5
      https://github.com/zanata/zanata-client/commit/d47e176e9223be0a0d0d12027a8a1a9df69439f5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M pom.xml
    M stub-server/pom.xml
    M stub-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    M zanata-cli/pom.xml
    M zanata-client-commands/pom.xml
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptionsImpl.java
    M zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    R zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullFileProjectITCase.java
    R zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullGettextITCase.java
    A zanata-client-commands/src/test/java/org/zanata/client/integration/PushPullFileProjectITCase.java
    A zanata-client-commands/src/test/java/org/zanata/client/integration/PushPullGettextITCase.java
    M zanata-maven-plugin/pom.xml
    M zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPushMojo.java
    M zanata-rest-client/pom.xml
    M zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java

  Log Message:
  -----------
  Add myTranslations options to push command
https://bugzilla.redhat.com/show_bug.cgi?id=1184299

Squashed commit of the following:

commit e0b4abbd972ce65ab19087bca9344035f6aabec2
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 5 14:46:27 2015 +1000

    Update client version to 3.7.0-SNAPSHOT, zanata-api to 3.7.0-SNAPSHOT

commit c21a156264ef2fd6d29517e2bbeab65337351bea
Merge: be52d4a b289753
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Jan 28 09:58:00 2015 +1000

    Merge branch 'master' into rhbz1184299

commit be52d4a1a66da4dcf0d241dbacc7a76c74c06e12
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Jan 28 08:49:13 2015 +1000

    Add myTranslations options to push command

  Commit: 7059ecbd72a51100204ae949788ff0347433a99f
      https://github.com/zanata/zanata-client/commit/7059ecbd72a51100204ae949788ff0347433a99f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptionsImpl.java

  Log Message:
  -----------
  Update my-trans option when push
- make it optional
- output selected option before executing push

Squashed commit of the following:

commit 381ddacb7ad80e86f97cecdb61e8508bd15390bb
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Feb 20 07:32:01 2015 +1000

    Update my-trans option when push

  Commit: 6347270c831684a206853b8fe8e413e6f715b4e0
      https://github.com/zanata/zanata-client/commit/6347270c831684a206853b8fe8e413e6f715b4e0
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M zanata-cli/src/test/java/org/zanata/client/ZanataClientTest.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptionsImpl.java
    M zanata-client-commands/src/main/resources/prompts.properties
    M zanata-maven-plugin/src/test/java/org/zanata/maven/PushMojoTest.java
    M zanata-maven-plugin/src/test/java/org/zanata/maven/ZanataMojoTest.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationLocalesClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java

  Log Message:
  -----------
  rhbz1156236 - deprecate locales in config file and fetch from server

  Commit: 591103878606c8e78d565e15111d5b8284ef2097
      https://github.com/zanata/zanata-client/commit/591103878606c8e78d565e15111d5b8284ef2097
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

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

Conflicts:
	pom.xml
	zanata-cli/pom.xml
	zanata-client-commands/pom.xml
	zanata-maven-plugin/pom.xml
	zanata-rest-client/pom.xml

  Commit: fd98995ce965d5a3aa7450bff8c8407fc1f79be7
      https://github.com/zanata/zanata-client/commit/fd98995ce965d5a3aa7450bff8c8407fc1f79be7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update parent to 21

  Commit: dd21226652f1ee7bd7f292db3e554635ac80b848
      https://github.com/zanata/zanata-client/commit/dd21226652f1ee7bd7f292db3e554635ac80b848
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    M docs/index.md

  Log Message:
  -----------
  Update licensing information.

  Commit: bc75d10e933c6fbf66116e61b6aca7b6b1944a5a
      https://github.com/zanata/zanata-client/commit/bc75d10e933c6fbf66116e61b6aca7b6b1944a5a
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    M zanata-client-commands/src/main/resources/prompts.properties

  Log Message:
  -----------
  rhbz1156236 - Change deprecation warning message for locales in zanata.xml

  Commit: 8422146f9184b43bc94ef4fe6378d3e072c1e41b
      https://github.com/zanata/zanata-client/commit/8422146f9184b43bc94ef4fe6378d3e072c1e41b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    A COPYING.GPL
    A COPYING.LESSER
    A zanata-cli/COPYING-header.txt
    M zanata-cli/pom.xml
    M zanata-cli/src/main/assembly/bin.xml
    M zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java

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

  Commit: 1e4413b50e380de29db4f9ed35fa39e8bd739f24
      https://github.com/zanata/zanata-client/commit/1e4413b50e380de29db4f9ed35fa39e8bd739f24
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    M docs/index.md

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into integration/master

  Commit: fb21f723248d2ad7a147d88d648332e5cf2b91d9
      https://github.com/zanata/zanata-client/commit/fb21f723248d2ad7a147d88d648332e5cf2b91d9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    M zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java

  Log Message:
  -----------
  Sort zanata-cli-completion by option names

  Commit: 9a6addee840f803db61adb94db71ae91fe4b8072
      https://github.com/zanata/zanata-client/commit/9a6addee840f803db61adb94db71ae91fe4b8072
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/AbstractPushPullOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushStrategy.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPushMojo.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPushPullMojo.java

  Log Message:
  -----------
  rhbz1156236 - update comment to reflect the fact of using server locale configuration

  Commit: 38e5fe8e6d3d5251d41854ccfae53b3ffaf24724
      https://github.com/zanata/zanata-client/commit/38e5fe8e6d3d5251d41854ccfae53b3ffaf24724
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M zanata-cli/src/test/java/org/zanata/client/ZanataClientTest.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/AbstractPushPullOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushStrategy.java
    M zanata-client-commands/src/main/resources/prompts.properties
    M zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPushMojo.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPushPullMojo.java
    M zanata-maven-plugin/src/test/java/org/zanata/maven/PushMojoTest.java
    M zanata-maven-plugin/src/test/java/org/zanata/maven/ZanataMojoTest.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationLocalesClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java

  Log Message:
  -----------
  Merge pull request #48 from zanata/locale-aliases

rhbz1156236 - deprecate locales in config file and fetch from server

  Commit: af19aa5e5f669389e0a953421ecdbfccf0c6bf28
      https://github.com/zanata/zanata-client/commit/af19aa5e5f669389e0a953421ecdbfccf0c6bf28
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M docs/configuration.md

  Log Message:
  -----------
  update readthedocs on mapping rules example

  Commit: 42b95f9a11d34919d56b664c49bbeaed99128f41
      https://github.com/zanata/zanata-client/commit/42b95f9a11d34919d56b664c49bbeaed99128f41
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java

  Log Message:
  -----------
  Merge pull request #50 from zanata/sort-by-option-name

Sort zanata-cli-completion by option names

  Commit: 99213a6b25180782bac81dfd43620142e27c8c1d
      https://github.com/zanata/zanata-client/commit/99213a6b25180782bac81dfd43620142e27c8c1d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M docs/configuration.md

  Log Message:
  -----------
  update wording and add note to docId

  Commit: 6110957c660e70d10169754a5c54ca7d87fd64cd
      https://github.com/zanata/zanata-client/commit/6110957c660e70d10169754a5c54ca7d87fd64cd
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M docs/configuration.md

  Log Message:
  -----------
  Merge pull request #51 from zanata/update-readthedocs

update readthedocs on mapping rules example

  Commit: 4f6acdd2e7c481764b035096d0b41b62f774bef6
      https://github.com/zanata/zanata-client/commit/4f6acdd2e7c481764b035096d0b41b62f774bef6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-20 (Fri, 20 Mar 2015)

  Changed paths:
    M docs/configuration.md

  Log Message:
  -----------
  add src-dir trans-dir section

  Commit: be3d559ed6ee5a0c53e5f10bf188caa65d73784a
      https://github.com/zanata/zanata-client/commit/be3d559ed6ee5a0c53e5f10bf188caa65d73784a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-20 (Fri, 20 Mar 2015)

  Changed paths:
    M docs/configuration.md

  Log Message:
  -----------
  Merge pull request #53 from zanata/docs-update

add src-dir trans-dir section

  Commit: 23dec1deb1ebd33b6e8c39cb052c03f848c503c2
      https://github.com/zanata/zanata-client/commit/23dec1deb1ebd33b6e8c39cb052c03f848c503c2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  upgrade zanata-common version to 3.6.0

  Commit: 9fbe0e4395cb2e492f295debc1bee1d55cf0c2f7
      https://github.com/zanata/zanata-client/commit/9fbe0e4395cb2e492f295debc1bee1d55cf0c2f7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-26 (Thu, 26 Mar 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #56 from zanata/rhbz1029734-po-header

upgrade zanata-common version to 3.6.0

  Commit: 70be8f968906b069b668fdab356d2de8940484af
      https://github.com/zanata/zanata-client/commit/70be8f968906b069b668fdab356d2de8940484af
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/stats/GetStatisticsOptionsImpl.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableMojo.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/GetStatisticsMojo.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/ListRemoteMojo.java

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

Conflicts:
	pom.xml
	zanata-cli/pom.xml
	zanata-client-commands/pom.xml
	zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptionsImpl.java
	zanata-maven-plugin/pom.xml
	zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
	zanata-rest-client/pom.xml
	zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderDecorator.java

  Commit: ed6acb0ab9b92cb83aefcb3a8b6151ea24130cac
      https://github.com/zanata/zanata-client/commit/ed6acb0ab9b92cb83aefcb3a8b6151ea24130cac
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-04-23 (Thu, 23 Apr 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java

  Log Message:
  -----------
  rely on content not content state when determine what can be omitted in push

  Commit: 01b65423f8b8cf30b84a4845d23faec5c0ddeb49
      https://github.com/zanata/zanata-client/commit/01b65423f8b8cf30b84a4845d23faec5c0ddeb49
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-04-23 (Thu, 23 Apr 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java

  Log Message:
  -----------
  Merge pull request #58 from zanata/fix-optimization-bug

rely on content not content state when determine what can be omitted in push

  Commit: d7dc398b9f3b4ee1096a6cb41505352d509540c1
      https://github.com/zanata/zanata-client/commit/d7dc398b9f3b4ee1096a6cb41505352d509540c1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-28 (Tue, 28 Apr 2015)

  Changed paths:
    A docs/command-hook.md
    M mkdocs.yml

  Log Message:
  -----------
  Add command hook documentation from server

  Commit: 025b1b2532867d83ef1f21432b9d5dbdee4122db
      https://github.com/zanata/zanata-client/commit/025b1b2532867d83ef1f21432b9d5dbdee4122db
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-04-28 (Tue, 28 Apr 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java

  Log Message:
  -----------
  rhbz903964 - try to display better error message if available

  Commit: e64ddb53c3877ee255bbe2a18fa7efe78110aa77
      https://github.com/zanata/zanata-client/commit/e64ddb53c3877ee255bbe2a18fa7efe78110aa77
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-28 (Tue, 28 Apr 2015)

  Changed paths:
    A docs/command-hook.md
    M mkdocs.yml

  Log Message:
  -----------
  Merge pull request #59 from zanata/add-command-hook-doc

Add command hook documentation from server

  Commit: a913fa5e4779c92f1432a2c40a7b0d67c03b79d1
      https://github.com/zanata/zanata-client/commit/a913fa5e4779c92f1432a2c40a7b0d67c03b79d1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-04-29 (Wed, 29 Apr 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java

  Log Message:
  -----------
  Merge pull request #60 from zanata/rhbz903964-better-error-msg

rhbz903964 - try to display better error message if available

  Commit: 57b61850cc35e0f01182531062fe74a55c698400
      https://github.com/zanata/zanata-client/commit/57b61850cc35e0f01182531062fe74a55c698400
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M pom.xml
    M stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/FileMappingRuleHandler.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/Messages.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/TransFileResolver.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushStrategy.java
    A zanata-client-commands/src/main/java/org/zanata/client/exceptions/InvalidUserInputException.java
    M zanata-client-commands/src/main/resources/prompts.properties
    M zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/FileMappingRuleHandlerTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/TransFileResolverTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/pull/RawPullStrategyTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/PropertiesPushStrategyTest.java
    A zanata-client-commands/src/test/java/org/zanata/client/commands/push/RawPushCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/RawPushStrategyTest.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtil.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java

  Log Message:
  -----------
  Implement doc type support for file projec type

https://bugzilla.redhat.com/show_bug.cgi?id=1186972

Squashed commit of the following:

commit 62aa4858eb8a391540f217b27b5da52c0d2a77da
Author: Alex Eng <aeng at redhat.com>
Date:   Thu May 7 11:07:42 2015 +1000

    Add help for file-types

commit b2c78cc269639341c2e2834ac6bf617b3a6118e0
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 29 13:23:49 2015 +1000

    Add messages.format for localised message

commit a88e76cc151bee8e877bb0a3990bbb6768f47b8d
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Apr 9 11:21:39 2015 +1000

    Implement doc type support for file projec type: https://bugzilla.redhat.com/show_bug.cgi?id=1186972

  Commit: ce69620185f595278b3020c96e264fc9befba36c
      https://github.com/zanata/zanata-client/commit/ce69620185f595278b3020c96e264fc9befba36c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M docs/commands/init.md
    M docs/commands/pull.md
    M docs/commands/push.md
    M docs/configuration.md
    M docs/index.md
    M docs/installation.md
    A docs/ivy/installation.md
    A docs/ivy/setup.md
    M docs/maven-plugin/commands.md
    M docs/maven-plugin/configuration.md
    M docs/maven-plugin/installation.md
    M mkdocs.yml

  Log Message:
  -----------
  Update Ivy installation doc

  Commit: cdfdd2af945f66578deb4104bc5c1573492547b9
      https://github.com/zanata/zanata-client/commit/cdfdd2af945f66578deb4104bc5c1573492547b9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M docs/commands/init.md
    M docs/commands/pull.md
    M docs/commands/push.md
    M docs/configuration.md
    M docs/index.md
    M docs/installation.md
    A docs/ivy/installation.md
    A docs/ivy/setup.md
    M docs/maven-plugin/commands.md
    M docs/maven-plugin/configuration.md
    M docs/maven-plugin/installation.md
    M mkdocs.yml

  Log Message:
  -----------
  Merge pull request #61 from zanata/update-docs

Update Ivy installation doc

  Commit: 6069eeb9df11149e4c9ce4ea105ace5148d33af2
      https://github.com/zanata/zanata-client/commit/6069eeb9df11149e4c9ce4ea105ace5148d33af2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-18 (Mon, 18 May 2015)

  Changed paths:
    M zanata-rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java

  Log Message:
  -----------
  fix potential bug to handle null argument better

  Commit: 39020544893010ad211002fa0fb7b0685f8e9712
      https://github.com/zanata/zanata-client/commit/39020544893010ad211002fa0fb7b0685f8e9712
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-18 (Mon, 18 May 2015)

  Changed paths:
    M zanata-cli/src/test/java/org/zanata/client/ClientToServerTest.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java

  Log Message:
  -----------
  rhbz1215274 - allow specify minimum accepted translation percentage

  Commit: 8c2c71f1ff516d555038831b4d48e384c1c9baaf
      https://github.com/zanata/zanata-client/commit/8c2c71f1ff516d555038831b4d48e384c1c9baaf
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-18 (Mon, 18 May 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java

  Log Message:
  -----------
  rhbz1215274 - refactor: extract method to make it easier to test

  Commit: 5895ecda5c7b70a9167fd693a29e8b67beaa0b10
      https://github.com/zanata/zanata-client/commit/5895ecda5c7b70a9167fd693a29e8b67beaa0b10
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/BasicOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
    A zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java

  Log Message:
  -----------
  rhbz1215274 - add test for minimum doc percent in pull command

  Commit: 704025f1dae65e5f88083ffd1dd270483f3b25bf
      https://github.com/zanata/zanata-client/commit/704025f1dae65e5f88083ffd1dd270483f3b25bf
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java

  Log Message:
  -----------
  rhbz1222730 - add options to use cache in java client

  Commit: cde28583f5648ea65790ad1366c974d625371b24
      https://github.com/zanata/zanata-client/commit/cde28583f5648ea65790ad1366c974d625371b24
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConsoleInteractorImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/SystemExitStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/InitCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/stats/ConsoleStatisticsOutput.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/stats/CsvStatisticsOutput.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/InitCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/RawPushCommandTest.java

  Log Message:
  -----------
  Update deprecated reference used.

Squashed commit of the following:

commit 45657c2a317086263e11621d0d4fe69565756282
Author: Alex Eng <aeng at redhat.com>
Date:   Mon May 18 10:17:55 2015 +1000

    Update console not available message

commit 6bf2bfa24086d50c6da7cbd101a11014ff0f03ce
Author: Alex Eng <aeng at redhat.com>
Date:   Mon May 18 07:45:56 2015 +1000

    Add checking of null System.console

commit e8f5085224502cba31effed5b41c106539ed893f
Author: Alex Eng <aeng at redhat.com>
Date:   Fri May 15 13:12:52 2015 +1000

    update deprecated reference used

  Commit: ac033b281eca30b9c34f6b3fcee695fa3bb3636a
      https://github.com/zanata/zanata-client/commit/ac033b281eca30b9c34f6b3fcee695fa3bb3636a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java

  Log Message:
  -----------
  rhbz1215274 - refactor

  Commit: 0dc9b431df7e62290e59cf1c54a05a617ddfa31a
      https://github.com/zanata/zanata-client/commit/0dc9b431df7e62290e59cf1c54a05a617ddfa31a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConsoleInteractorImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/InitCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java

  Log Message:
  -----------
  Disable throw error if batch mode enabled

  Commit: dc82b16e5b9e69f6e57cc0249c26788c5db34a71
      https://github.com/zanata/zanata-client/commit/dc82b16e5b9e69f6e57cc0249c26788c5db34a71
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConsoleInteractorImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/InitCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java

  Log Message:
  -----------
  Merge pull request #65 from zanata/check-batch-mode

Disable throw error if batch mode enabled

  Commit: 019a1ae9d658d922661c54caa7eaf304735c6b07
      https://github.com/zanata/zanata-client/commit/019a1ae9d658d922661c54caa7eaf304735c6b07
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java

  Log Message:
  -----------
  rhbz1215274 - enable min doc percent for file type project

  Commit: 946c6712bbb3d22c5877e4dd6c66dd54cd75e59d
      https://github.com/zanata/zanata-client/commit/946c6712bbb3d22c5877e4dd6c66dd54cd75e59d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java

  Log Message:
  -----------
  Merge pull request #64 from zanata/rhbz1222730-cache-options

rhbz1222730 - add options to use cache in java client

  Commit: 31d5eed1ed4f5129ab9a5587e540947adba984cc
      https://github.com/zanata/zanata-client/commit/31d5eed1ed4f5129ab9a5587e540947adba984cc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java

  Log Message:
  -----------
  rhbz1215274 - fix issues

- total number can be zero
- maven argument missing a bracket
- optimize stats to only include asking locales
- use double for percentage calculation

  Commit: d980118f4c4f78b6d1cc5ec312a60c95ba1eca3b
      https://github.com/zanata/zanata-client/commit/d980118f4c4f78b6d1cc5ec312a60c95ba1eca3b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConsoleInteractorImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/SystemExitStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/InitCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/stats/ConsoleStatisticsOutput.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/stats/CsvStatisticsOutput.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/InitCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/RawPushCommandTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into min-doc-percent

Conflicts:
	zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java

  Commit: 243afc8722b3cc8500d885070eccbed543cc0d79
      https://github.com/zanata/zanata-client/commit/243afc8722b3cc8500d885070eccbed543cc0d79
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java

  Log Message:
  -----------
  rhbz1215274 - log info if stats is required which may take longer time to process

  Commit: 2f0ab59fad05fe251cc14cb96ae12e7ba1e5d5a1
      https://github.com/zanata/zanata-client/commit/2f0ab59fad05fe251cc14cb96ae12e7ba1e5d5a1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java

  Log Message:
  -----------
  fix fingbugs error

  Commit: a0cd16978d6590b6509ec8fab5f8adff2fb8c521
      https://github.com/zanata/zanata-client/commit/a0cd16978d6590b6509ec8fab5f8adff2fb8c521
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-27 (Wed, 27 May 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java

  Log Message:
  -----------
  rhbz1215274 - add info to indicate the stats is message based

  Commit: d13462f1dd31e37438a634743fe5a2861bbadf4e
      https://github.com/zanata/zanata-client/commit/d13462f1dd31e37438a634743fe5a2861bbadf4e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-05-28 (Thu, 28 May 2015)

  Changed paths:
    M zanata-cli/src/test/java/org/zanata/client/ClientToServerTest.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/BasicOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    A zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java

  Log Message:
  -----------
  Merge pull request #63 from zanata/min-doc-percent

rhbz1215274 - Min doc percent

  Commit: 8dc3cda20422b1bd27a2d1ddfb41ea4bac19c3ca
      https://github.com/zanata/zanata-client/commit/8dc3cda20422b1bd27a2d1ddfb41ea4bac19c3ca
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptionsImpl.java

  Log Message:
  -----------
  Fix help message for file type

  Commit: c6e21e2757d4a9ffa993bdc21829894a1aa1807e
      https://github.com/zanata/zanata-client/commit/c6e21e2757d4a9ffa993bdc21829894a1aa1807e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptionsImpl.java

  Log Message:
  -----------
  Merge pull request #66 from zanata/fix-help-message

Fix help message for file type

  Commit: cf059c2f40af19350fd03ee4e1e4308d7cd92508
      https://github.com/zanata/zanata-client/commit/cf059c2f40af19350fd03ee4e1e4308d7cd92508
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M zanata-cli/src/test/java/org/zanata/client/ClientToServerTest.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/BasicOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    A zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java

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

  Commit: 8f655f11580e682a5825d7a83735c3a176140379
      https://github.com/zanata/zanata-client/commit/8f655f11580e682a5825d7a83735c3a176140379
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update api and common

  Commit: 352a90e625b67403f4f15de43f4ab8174a344760
      https://github.com/zanata/zanata-client/commit/352a90e625b67403f4f15de43f4ab8174a344760
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M .gitignore
    M pom.xml
    M stub-server/pom.xml
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectIterationPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/UserConfigHandler.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M zanata-rest-client/pom.xml

  Log Message:
  -----------
  Update to latest parent; fix warnings

  Commit: 790a04b4ffdcbddfeb1ecee72b9ae9f523ffbd75
      https://github.com/zanata/zanata-client/commit/790a04b4ffdcbddfeb1ecee72b9ae9f523ffbd75
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M docs/commands/push.md
    M docs/configuration.md
    M docs/index.md
    M docs/installation.md
    M docs/ivy/installation.md
    M docs/ivy/setup.md
    M docs/maven-plugin/commands.md
    M docs/maven-plugin/configuration.md
    M docs/maven-plugin/installation.md
    M mkdocs.yml

  Log Message:
  -----------
  Update mkdocs.yml, fix broken link

  Commit: 72e9da1eddef15d7ac64ec101eb3c0be413e4916
      https://github.com/zanata/zanata-client/commit/72e9da1eddef15d7ac64ec101eb3c0be413e4916
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M docs/commands/push.md
    M docs/configuration.md
    M docs/index.md
    M docs/installation.md
    M docs/ivy/installation.md
    M docs/ivy/setup.md
    M docs/maven-plugin/commands.md
    M docs/maven-plugin/configuration.md
    M docs/maven-plugin/installation.md
    M mkdocs.yml

  Log Message:
  -----------
  Merge pull request #67 from zanata/update-doc

Update mkdocs.yml, fix broken link

  Commit: 88b2a26bc615690ce630f3d18c82ae59e315c12a
      https://github.com/zanata/zanata-client/commit/88b2a26bc615690ce630f3d18c82ae59e315c12a
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M .gitignore
    A .travis-settings.xml
    M .travis.yml
    A docs/command-hook.md
    A docs/commands/init.md
    A docs/commands/pull.md
    A docs/commands/push.md
    A docs/configuration.md
    A docs/images/302-user-settings.png
    A docs/images/350-version-config-file.png
    A docs/index.md
    A docs/installation.md
    A docs/ivy/installation.md
    A docs/ivy/setup.md
    A docs/maven-plugin/commands.md
    A docs/maven-plugin/configuration.md
    A docs/maven-plugin/installation.md
    A mkdocs.yml
    M pom.xml
    R settings.xml
    A stub-server/pom.xml
    A stub-server/src/main/java/org/zanata/rest/service/MockAccountResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockCopyTransResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockGlossaryResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectIterationResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectsResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockResourceUtil.java
    A stub-server/src/main/java/org/zanata/rest/service/MockResourcesApplication.java
    A stub-server/src/main/java/org/zanata/rest/service/MockSourceDocResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockStatisticsResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockVersionResource.java
    A stub-server/src/main/java/org/zanata/rest/service/StubbingServerRule.java
    M zanata-cli/etc/scripts/zanata-cli
    M zanata-cli/pom.xml
    M zanata-cli/src/main/java/org/zanata/client/ZanataClient.java
    M zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java
    M zanata-cli/src/test/java/org/zanata/client/ClientToServerTest.java
    M zanata-cli/src/test/java/org/zanata/client/HTTPMockContainer.java
    M zanata-cli/src/test/java/org/zanata/client/ZanataClientTest.java
    M zanata-client-commands/pom.xml
    M zanata-client-commands/src/main/java/org/zanata/client/commands/AbstractPushPullOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/BasicOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConsoleInteractorImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/FileMappingRuleHandler.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ListLocalCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/Messages.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullCommand.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptions.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptionsImpl.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushCommand.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptions.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/SystemExitStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/TransFileResolver.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/UpdateChecker.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/gettext/PublicanUtil.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/InitCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectIterationPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/SourceConfigPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/TransConfigPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/UserConfigHandler.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/OfflinePoStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/stats/ConsoleStatisticsOutput.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/stats/CsvStatisticsOutput.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/stats/GetStatisticsCommand.java
    A zanata-client-commands/src/main/java/org/zanata/client/exceptions/InvalidUserInputException.java
    M zanata-client-commands/src/main/resources/prompts.properties
    M zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M zanata-client-commands/src/test/java/org/zanata/client/TestProjectGenerator.java
    M zanata-client-commands/src/test/java/org/zanata/client/TestUtils.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/FileMappingRuleHandlerTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/HTTPMockContainer.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/OptionsUtilTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/TransFileResolverTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/InitCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectIterationPromptTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectPromptTest.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PublicanPullCommandTest.java
    A zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/pull/RawPullStrategyTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/PropertiesPushStrategyTest.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/push/PublicanPushCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    A zanata-client-commands/src/test/java/org/zanata/client/commands/push/RawPushCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/RawPushStrategyTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/XliffPushStrategyTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/config/ConfigUtilTest.java
    R zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullFileProjectITCase.java
    R zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullGettextITCase.java
    A zanata-client-commands/src/test/java/org/zanata/client/integration/PushPullFileProjectITCase.java
    A zanata-client-commands/src/test/java/org/zanata/client/integration/PushPullGettextITCase.java
    M zanata-maven-plugin/pom.xml
    M zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPushMojo.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPushPullMojo.java
    R zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
    R zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/PushSimpleMojo.java
    M zanata-maven-plugin/src/test/java/org/zanata/maven/PushMojoTest.java
    M zanata-maven-plugin/src/test/java/org/zanata/maven/ZanataMojoTest.java
    M zanata-rest-client/pom.xml
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AcceptTypeFilter.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AccountClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderDecorator.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderFilter.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/CacheResponseFilter.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtil.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtility.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/CopyTransClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/GlossaryClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ITranslationResourcesFactory.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationLocalesClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectsClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/SourceDocResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugInterceptor.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    R zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderFilterTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java
    R zanata-rest-client/src/test/java/org/zanata/rest/client/ClientUtilityTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/CopyTransClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/MockServerTestUtil.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectsClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/RestClientFactoryTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java
    A zanata-rest-client/src/test/resources/test-odt.odt
    A zanata-rest-client/src/test/resources/zh-CN/test-odt.odt

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

Conflicts:
	pom.xml
	zanata-cli/pom.xml
	zanata-client-commands/pom.xml
	zanata-maven-plugin/pom.xml
	zanata-rest-client/pom.xml

Compare: https://github.com/zanata/zanata-client/compare/c8f390997e33...88b2a26bc615