[zanata/zanata-api] 3334e5: prepare for next development iteration
GitHub
noreply at github.com
Thu Sep 25 04:01:18 UTC 2014
Branch: refs/heads/release
Home: https://github.com/zanata/zanata-api
Commit: 3334e5f4a5b475d7f290c7d7aaa4fcdc3a99da8f
https://github.com/zanata/zanata-api/commit/3334e5f4a5b475d7f290c7d7aaa4fcdc3a99da8f
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-05-13 (Tue, 13 May 2014)
Changed paths:
M pom.xml
M zanata-common-api/pom.xml
Log Message:
-----------
prepare for next development iteration
Commit: 84990ee2a86f4d11e0cfc5982983784fe58612b7
https://github.com/zanata/zanata-api/commit/84990ee2a86f4d11e0cfc5982983784fe58612b7
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-05-13 (Tue, 13 May 2014)
Changed paths:
M pom.xml
M zanata-common-api/pom.xml
Log Message:
-----------
prepare for next development iteration
Commit: f674cdd44409c5067075eb9cd6d597b266f05df3
https://github.com/zanata/zanata-api/commit/f674cdd44409c5067075eb9cd6d597b266f05df3
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-05-13 (Tue, 13 May 2014)
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into integration/master
Conflicts:
pom.xml
zanata-common-api/pom.xml
Commit: f3b0e185e90ea4f9dd25a2152a4a89ed6fd29eb6
https://github.com/zanata/zanata-api/commit/f3b0e185e90ea4f9dd25a2152a4a89ed6fd29eb6
Author: Alex Eng <aeng at redhat.com>
Date: 2014-05-19 (Mon, 19 May 2014)
Changed paths:
M pom.xml
Log Message:
-----------
Merge branch 'release' into integration/master
Commit: 7bb0ba8f0e4c413c15318f5f615052fccde721d9
https://github.com/zanata/zanata-api/commit/7bb0ba8f0e4c413c15318f5f615052fccde721d9
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M pom.xml
Log Message:
-----------
Update zanata-parent
Commit: 4ec221879f50348c3ec0e5ec58e3c90763566d58
https://github.com/zanata/zanata-api/commit/4ec221879f50348c3ec0e5ec58e3c90763566d58
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M pom.xml
Log Message:
-----------
Revert "Update zanata-parent"
This reverts commit 7bb0ba8f0e4c413c15318f5f615052fccde721d9.
Commit: 4a78c13f29617fd4ffebbcc8c569ef5193b9f2bf
https://github.com/zanata/zanata-api/commit/4a78c13f29617fd4ffebbcc8c569ef5193b9f2bf
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M pom.xml
M zanata-common-api/pom.xml
Log Message:
-----------
Upgrade parent; exclude findbugs:jsr305
Commit: 6a57d528d31a4507b46efcc52c3b9f68866afb23
https://github.com/zanata/zanata-api/commit/6a57d528d31a4507b46efcc52c3b9f68866afb23
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M pom.xml
M zanata-common-api/pom.xml
Log Message:
-----------
Merge pull request #14 from zanata/exclude-jsr305
Exclude findbugs:jsr305
Commit: 03dec6b64ef046c140523a8ea2f50d7bed149a58
https://github.com/zanata/zanata-api/commit/03dec6b64ef046c140523a8ea2f50d7bed149a58
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M zanata-common-api/pom.xml
Log Message:
-----------
Remove exception for findbugs annotations
Commit: cf4da9015e0f7e2770fad2e365253a009b7dcb3f
https://github.com/zanata/zanata-api/commit/cf4da9015e0f7e2770fad2e365253a009b7dcb3f
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-07-03 (Thu, 03 Jul 2014)
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/service/ProjectIterationResource.java
Log Message:
-----------
rhbz1110627 - add REST endpoint for project config
Commit: 3ad9352aceda3040eb802b4a9ab4f1bfea57538c
https://github.com/zanata/zanata-api/commit/3ad9352aceda3040eb802b4a9ab4f1bfea57538c
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-07-03 (Thu, 03 Jul 2014)
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/service/ProjectIterationResource.java
Log Message:
-----------
Merge pull request #15 from zanata/rhbz1110627-zanata-init
rhbz1110627 - add REST endpoint for project config
Commit: a0f41f95163ab2aabfc2824b212dbfd1a4989a9c
https://github.com/zanata/zanata-api/commit/a0f41f95163ab2aabfc2824b212dbfd1a4989a9c
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-08-01 (Fri, 01 Aug 2014)
Changed paths:
M zanata-common-api/pom.xml
Log Message:
-----------
Remove banned dependencies
Commit: 6aa6bef59c8b22760c2cd8a42895c83bad920a45
https://github.com/zanata/zanata-api/commit/6aa6bef59c8b22760c2cd8a42895c83bad920a45
Author: David Mason <drdmason at gmail.com>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M .gitignore
Log Message:
-----------
ignore intellij idea config
Commit: f32c405dc37b69ac542549049ea991e14b5c4008
https://github.com/zanata/zanata-api/commit/f32c405dc37b69ac542549049ea991e14b5c4008
Author: David Mason <drdmason at gmail.com>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M zanata-common-api/src/main/java/org/zanata/common/ProjectType.java
Log Message:
-----------
add function to get supported source types for a ProjectType
Commit: 56be2b60fd2b9295f523a29543ab13b629026f3b
https://github.com/zanata/zanata-api/commit/56be2b60fd2b9295f523a29543ab13b629026f3b
Author: David Mason <drdmason at gmail.com>
Date: 2014-08-07 (Thu, 07 Aug 2014)
Changed paths:
M zanata-common-api/src/main/java/org/zanata/common/DocumentType.java
M zanata-common-api/src/main/java/org/zanata/common/ProjectType.java
M zanata-common-api/src/test/java/org/zanata/common/DocumentTypeTest.java
A zanata-common-api/src/test/java/org/zanata/common/ProjectTypeTest.java
Log Message:
-----------
Add test for ProjectType and add license headers.
Commit: bd76bf2234ad721b9a2a8491c3ef5f18af53fe49
https://github.com/zanata/zanata-api/commit/bd76bf2234ad721b9a2a8491c3ef5f18af53fe49
Author: David Mason <drdmason at gmail.com>
Date: 2014-08-07 (Thu, 07 Aug 2014)
Changed paths:
M .gitignore
M zanata-common-api/src/main/java/org/zanata/common/DocumentType.java
M zanata-common-api/src/main/java/org/zanata/common/ProjectType.java
M zanata-common-api/src/test/java/org/zanata/common/DocumentTypeTest.java
A zanata-common-api/src/test/java/org/zanata/common/ProjectTypeTest.java
Log Message:
-----------
Merge pull request #17 from zanata/supported-source-types
Add function to ProjectType to get supported source types.
Commit: 028e87a471da43e0d73f31d6eb36ec8f91bef7c5
https://github.com/zanata/zanata-api/commit/028e87a471da43e0d73f31d6eb36ec8f91bef7c5
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M pom.xml
M zanata-common-api/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release api-3.4.0
Commit: 74275128564129c8454ddfdba1e66498f3c8b1d1
https://github.com/zanata/zanata-api/commit/74275128564129c8454ddfdba1e66498f3c8b1d1
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M pom.xml
M zanata-common-api/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: 2c80075a0369809d92f0e4193041e64e560a41e1
https://github.com/zanata/zanata-api/commit/2c80075a0369809d92f0e4193041e64e560a41e1
Author: David Mason <drdmason at gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
M .gitignore
Log Message:
-----------
add .orig files to .gitignore
Commit: 28c29d6daf7b367dd8871780740d76b2efb888bd
https://github.com/zanata/zanata-api/commit/28c29d6daf7b367dd8871780740d76b2efb888bd
Author: David Mason <drdmason at gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Log Message:
-----------
Merge diverged release branch with -s ours.
Release branch appears to have had a backported update, then had the
release plugin run to generate a tag and update version numbers.
I am merging it into master but discarding the version changes, so
that the release tag remains part of the direct history of the development
branch.
This is happening the day after a release was made. It should have been
done before, but there should be no harm in merging it now, it just means
the recent release node is not strictly an ancestor of the previous release.
The next release will be an ancestor of both.
Compare: https://github.com/zanata/zanata-api/compare/804a46a7c164...28c29d6daf7b
More information about the zanata-commits
mailing list