[zanata/zanata-api] e4e0f7: Merge pull request #13 from zanata/update-parent-p...

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-api
  Commit: e4e0f769711cdb6ad939a22c477beb1844cc2895
      https://github.com/zanata/zanata-api/commit/e4e0f769711cdb6ad939a22c477beb1844cc2895
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #13 from zanata/update-parent-pom

Update Zanata parent


  Commit: 42d8d5a369900c27b3e2ded4839de619fe527fbd
      https://github.com/zanata/zanata-api/commit/42d8d5a369900c27b3e2ded4839de619fe527fbd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M pom.xml
    M zanata-common-api/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release api-3.3.1


  Commit: 804a46a7c164971595578ba91cfed9dcc1a7f9a2
      https://github.com/zanata/zanata-api/commit/804a46a7c164971595578ba91cfed9dcc1a7f9a2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M pom.xml
    M zanata-common-api/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration


  Commit: 28c29d6daf7b367dd8871780740d76b2efb888bd
      https://github.com/zanata/zanata-api/commit/28c29d6daf7b367dd8871780740d76b2efb888bd
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-09-25 (Thu, 25 Sep 2014)

  Log Message:
  -----------
  Merge diverged release branch with -s ours.

Release branch appears to have had a backported update, then had the
release plugin run to generate a tag and update version numbers.

I am merging it into master but discarding the version changes, so
that the release tag remains part of the direct history of the development
branch.

This is happening the day after a release was made. It should have been
done before, but there should be no harm in merging it now, it just means
the recent release node is not strictly an ancestor of the previous release.
The next release will be an ancestor of both.


  Commit: c88843754835cd55eb1acad597477e20fab5ab7b
      https://github.com/zanata/zanata-api/commit/c88843754835cd55eb1acad597477e20fab5ab7b
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-09-25 (Thu, 25 Sep 2014)

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


Compare: https://github.com/zanata/zanata-api/compare/b0c54c08f583...c88843754835