[zanata/zanata] c6bd4d: [maven-release-plugin] prepare release server-2.1....

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata
  Commit: c6bd4da8076adc12e608be25970cd8ab56800dce
      https://github.com/zanata/zanata/commit/c6bd4da8076adc12e608be25970cd8ab56800dce
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  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-2.1.4


  Commit: af0a61c47eb3924823664b6ca5fd9ad07c4a99ef
      https://github.com/zanata/zanata/commit/af0a61c47eb3924823664b6ca5fd9ad07c4a99ef
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  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: c199df67738e5418091bd1224f0fa7fa83d9868a
      https://github.com/zanata/zanata/commit/c199df67738e5418091bd1224f0fa7fa83d9868a
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-18 (Mon, 18 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java

  Log Message:
  -----------
  rhbz903964 - Error messages are now communicated to the client on async push.


  Commit: 22d7976121c9ab34fe5cc02fcd7081b77108a61d
      https://github.com/zanata/zanata/commit/22d7976121c9ab34fe5cc02fcd7081b77108a61d
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-18 (Mon, 18 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java

  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/compare/2abb2527fed7...22d7976121c9