[zanata/zanata-api] cdb272: Implement project type when put-project and put-ve...

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-api
  Commit: cdb2728446c52ec450ff93c6f2be5af439fb6731
      https://github.com/zanata/zanata-api/commit/cdb2728446c52ec450ff93c6f2be5af439fb6731
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M zanata-common-api/src/main/java/org/zanata/rest/client/IProjectIterationResource.java
    M zanata-common-api/src/main/java/org/zanata/rest/client/IProjectResource.java
    M zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectType.java
    R zanata-common-api/src/main/java/org/zanata/rest/dto/Replace.java
    R zanata-common-api/src/main/java/org/zanata/rest/dto/UpdateProject.java
    R zanata-common-api/src/main/java/org/zanata/rest/dto/UpdateProjectIteration.java
    M zanata-common-api/src/main/java/org/zanata/rest/service/ProjectIterationResource.java
    M zanata-common-api/src/main/java/org/zanata/rest/service/ProjectResource.java

  Log Message:
  -----------
  Implement project type when put-project and put-version: https://bugzilla.redhat.com/show_bug.cgi?id=895280


  Commit: 4682ed0b3cd140ca59e44a631ea0de128660bd75
      https://github.com/zanata/zanata-api/commit/4682ed0b3cd140ca59e44a631ea0de128660bd75
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectType.java

  Log Message:
  -----------
  Merge branch 'integration/master' of github.com:zanata/zanata-api into integration/master

Conflicts:
	zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectType.java


Compare: https://github.com/zanata/zanata-api/compare/55ca7ba1375a...4682ed0b3cd1