[zanata/zanata] c3bc9d: [maven-release-plugin] prepare release server-1.7....

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata
  Commit: c3bc9db4a20d330c4206990d4b103cf68e3b4f26
      https://github.com/zanata/zanata/commit/c3bc9db4a20d330c4206990d4b103cf68e3b4f26
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

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


  Commit: 7549d1afd24ae3a5b758986eb8eda12882d4a30d
      https://github.com/zanata/zanata/commit/7549d1afd24ae3a5b758986eb8eda12882d4a30d
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  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: 05e086735cb77889430e1d884aebb9923210d8ab
      https://github.com/zanata/zanata/commit/05e086735cb77889430e1d884aebb9923210d8ab
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-08-26 (Sun, 26 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java

  Log Message:
  -----------
  rhbz702252 Increase lock timeout when creating translation workspace


  Commit: 42cb5d242de1c2eaa7c8c480d6733ce240db4cc1
      https://github.com/zanata/zanata/commit/42cb5d242de1c2eaa7c8c480d6733ce240db4cc1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ZanataInit.java

  Log Message:
  -----------
  Check for leftover Lucene locks on startup


  Commit: db44dc0fc755ebd848541b9b2b8495aea84691d9
      https://github.com/zanata/zanata/commit/db44dc0fc755ebd848541b9b2b8495aea84691d9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java

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

Conflicts:
	functional-test/pom.xml
	pom.xml
	zanata-model/pom.xml
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/ZanataInit.java


Compare: https://github.com/zanata/zanata/compare/43dbd8aa7402...db44dc0fc755