[zanata/zanata-server] d506af: [maven-release-plugin] prepare release server-3.2....

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: d506af25ddeea0f85eb3f672f1721759d401606d
      https://github.com/zanata/zanata-server/commit/d506af25ddeea0f85eb3f672f1721759d401606d
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-01-19 (Sun, 19 Jan 2014)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.2.3


  Commit: eefc20fa15aae94ab8bc0b11c30f63bbb351da58
      https://github.com/zanata/zanata-server/commit/eefc20fa15aae94ab8bc0b11c30f63bbb351da58
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-01-19 (Sun, 19 Jan 2014)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

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


  Commit: f8b8936cd37f7664fab174f9e46b8df5c538b880
      https://github.com/zanata/zanata-server/commit/f8b8936cd37f7664fab174f9e46b8df5c538b880
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-19 (Wed, 19 Feb 2014)

  Changed paths:
    M .gitattributes

  Log Message:
  -----------
  change git attributes for text line ending handle


  Commit: 86d3f1d4173bec7350df2f7078f46ada7ec2be6b
      https://github.com/zanata/zanata-server/commit/86d3f1d4173bec7350df2f7078f46ada7ec2be6b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-19 (Wed, 19 Feb 2014)

  Changed paths:
    M .gitattributes

  Log Message:
  -----------
  Merge branch 'legacy' into release


  Commit: 1cf87f295bb47a94dec0e05340486fb851fa12ed
      https://github.com/zanata/zanata-server/commit/1cf87f295bb47a94dec0e05340486fb851fa12ed
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-19 (Wed, 19 Feb 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  fix line ending


  Commit: 6b321015c4eade2e41ce6448fa303dda04e08e59
      https://github.com/zanata/zanata-server/commit/6b321015c4eade2e41ce6448fa303dda04e08e59
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-19 (Wed, 19 Feb 2014)

  Changed paths:
    M .gitattributes

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

Conflicts:
	functional-test/pom.xml
	pom.xml
	zanata-model/pom.xml
	zanata-war/pom.xml


Compare: https://github.com/zanata/zanata-server/compare/6846a85d7a28...6b321015c4ea