[zanata-commits] [zanata/zanata] 5590ea: [maven-release-plugin] prepare release zanata-1.4....

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata

  Commit: 5590eaaca225c603399f19adc4fa15d1827de273
      https://github.com/zanata/zanata/commit/5590eaaca225c603399f19adc4fa15d1827de273
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-10-27 (Thu, 27 Oct 2011)

  Changed paths:
    M client/pom.xml
  M client/zanata-adapter-po/pom.xml
  M client/zanata-adapter-properties/pom.xml
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-commands/pom.xml
  M client/zanata-maven-plugin/pom.xml
  M common/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-util/pom.xml
  M common/zanata-rest-client/pom.xml
  M pom.xml
  M server/pom.xml
  M server/zanata-model/pom.xml
  M server/zanata-war/pom.xml
  M zanata-parent/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release zanata-1.4.2


  Commit: 0fe7c3d4ed72920677e69639640e90ec555b9242
      https://github.com/zanata/zanata/commit/0fe7c3d4ed72920677e69639640e90ec555b9242
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-10-27 (Thu, 27 Oct 2011)

  Changed paths:
    M client/pom.xml
  M client/zanata-adapter-po/pom.xml
  M client/zanata-adapter-properties/pom.xml
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-commands/pom.xml
  M client/zanata-maven-plugin/pom.xml
  M common/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-util/pom.xml
  M common/zanata-rest-client/pom.xml
  M pom.xml
  M server/pom.xml
  M server/zanata-model/pom.xml
  M server/zanata-war/pom.xml
  M zanata-parent/pom.xml

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


  Commit: 63d789d626974ca2c09c13fb735ce5e7bdcb357e
      https://github.com/zanata/zanata/commit/63d789d626974ca2c09c13fb735ce5e7bdcb357e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-10-27 (Thu, 27 Oct 2011)

  Changed paths:
    M CHANGELOG.md

  Log Message:
  -----------
  Update changelog


  Commit: 01adc2022afb3c7d69130acf4689b95c582383ff
      https://github.com/zanata/zanata/commit/01adc2022afb3c7d69130acf4689b95c582383ff
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-11-01 (Tue, 01 Nov 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitDetailsView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitDetailsView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java

  Log Message:
  -----------
  Enable Message Context in TransUnit section: https://bugzilla.redhat.com/show_bug.cgi?id=750690


  Commit: 174aff392bb5f45fa87524d2cec9cfcce97316cc
      https://github.com/zanata/zanata/commit/174aff392bb5f45fa87524d2cec9cfcce97316cc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-11-01 (Tue, 01 Nov 2011)

  Changed paths:
    M CHANGELOG.md
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitDetailsView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitDetailsView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java

  Log Message:
  -----------
  Merge branch '1.4'

Conflicts:
	client/pom.xml
	client/zanata-adapter-po/pom.xml
	client/zanata-adapter-properties/pom.xml
	client/zanata-adapter-xliff/pom.xml
	client/zanata-client-ant-po/pom.xml
	client/zanata-client-ant-properties/pom.xml
	client/zanata-client-commands/pom.xml
	client/zanata-maven-plugin/pom.xml
	common/pom.xml
	common/zanata-common-api/pom.xml
	common/zanata-common-util/pom.xml
	common/zanata-rest-client/pom.xml
	pom.xml
	server/pom.xml
	server/zanata-model/pom.xml
	server/zanata-war/pom.xml
	zanata-parent/pom.xml


Compare: https://github.com/zanata/zanata/compare/876884e...174aff3