diff options
| author | Edwin Kempin <edwin.kempin@sap.com> | 2012-10-31 22:23:14 +0100 |
|---|---|---|
| committer | Edwin Kempin <edwin.kempin@sap.com> | 2012-10-31 22:23:24 +0100 |
| commit | d19be975e29d2b870913567d4c2bb7b8e155784a (patch) | |
| tree | 14cbade1881d2c15a8f2d528b71a7d7f50c99233 | |
| parent | 96324746e369c50501d86387cd821a03a5ad2a52 (diff) | |
| parent | b465b6d753559781bcc44adf1077b09d820d09a5 (diff) | |
Merge branch 'stable-2.5'
* stable-2.5:
Update versions of included core plugins for Gerrit 2.5 release
Finalize release notes for Gerrit 2.5
Change-Id: Ia13b273aba31b5b6dd94e8d1df2443a4cedb7a2c
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
| -rw-r--r-- | ReleaseNotes/ReleaseNotes-2.5.txt | 3 | ||||
| -rw-r--r-- | gerrit-package-plugins/pom.xml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ReleaseNotes/ReleaseNotes-2.5.txt b/ReleaseNotes/ReleaseNotes-2.5.txt index 2a3dacffe1..55fbb60d6e 100644 --- a/ReleaseNotes/ReleaseNotes-2.5.txt +++ b/ReleaseNotes/ReleaseNotes-2.5.txt @@ -1833,6 +1833,9 @@ which is added to the change. Using any of the download commands to fetch this new patch set failed with 'Couldn't find remote ref' because no ref for the new patch set was created. +* link:http://code.google.com/p/gerrit/issues/detail?id=1626[issue 1626]: + Fix NullPointerException on cherry-pick if `changeMerge.test` is enabled + * link:http://code.google.com/p/gerrit/issues/detail?id=1491[issue 1491]: Fix nested submodule updates diff --git a/gerrit-package-plugins/pom.xml b/gerrit-package-plugins/pom.xml index f761597af9..5a4cdbb8d6 100644 --- a/gerrit-package-plugins/pom.xml +++ b/gerrit-package-plugins/pom.xml @@ -43,7 +43,7 @@ limitations under the License. <dependency> <groupId>com.googlesource.gerrit.plugins.replication</groupId> <artifactId>replication</artifactId> - <version>1.0-rc2</version> + <version>1.0</version> <scope>provided</scope> </dependency> </dependencies> |