[zanata/zanata-server] a39163: [maven-release-plugin] prepare release server-3.4....

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: a391631ea4f96720f4a2f0ef5050d5c7dca73be6
      https://github.com/zanata/zanata-server/commit/a391631ea4f96720f4a2f0ef5050d5c7dca73be6
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-05-20 (Tue, 20 May 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.4.0


  Commit: 36f277b3fa793d3c5333afb3d7625d4d1bb46605
      https://github.com/zanata/zanata-server/commit/36f277b3fa793d3c5333afb3d7625d4d1bb46605
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-05-20 (Tue, 20 May 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: ff8ce068f29b6e315cb0fc519cc99ff83d63eedd
      https://github.com/zanata/zanata-server/commit/ff8ce068f29b6e315cb0fc519cc99ff83d63eedd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Upgrade to commons-fileupload 1.3.1


  Commit: f5bfc084687e0ac884f61ba6686b895d2000b8c8
      https://github.com/zanata/zanata-server/commit/f5bfc084687e0ac884f61ba6686b895d2000b8c8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Fix translation file upload: https://bugzilla.redhat.com/show_bug.cgi?id=1099400


  Commit: 442482b7ce4bfef39bf6d1e7a02f3e780b4a73a1
      https://github.com/zanata/zanata-server/commit/442482b7ce4bfef39bf6d1e7a02f3e780b4a73a1
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Merge pull request #456 from zanata/rhbz1099400

Fix translation file upload exception


  Commit: a17cb1fde21d7adbc4c44764a2c994156d2adee8
      https://github.com/zanata/zanata-server/commit/a17cb1fde21d7adbc4c44764a2c994156d2adee8
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #454 from zanata/rhbz1099349

Upgrade to commons-fileupload 1.3.1


  Commit: 9c4135543cc9ef86ed571c617466352fe8e81cfb
      https://github.com/zanata/zanata-server/commit/9c4135543cc9ef86ed571c617466352fe8e81cfb
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-22 (Thu, 22 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  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/6309507d3401...9c4135543cc9