diff options
| author | David Pursehouse <david.pursehouse@sonymobile.com> | 2015-06-12 10:53:00 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | 2015-06-12 10:53:00 +0900 |
| commit | 84db9670c0f90b250739d880dbf9af50fbdacdf2 (patch) | |
| tree | 4dc33f22cab7aece78c7f921da0678d422b8ad8c | |
| parent | 1a26fb3c3e82879b6df101600bb04bdbf27464e5 (diff) | |
| parent | 0ffc46d87ea7d49c4e72423de0f28c08862af71b (diff) | |
Merge branch 'stable-2.10' into stable-2.11
* stable-2.10:
Update version to 2.10.5
Release notes for 2.10.5
Fixed regression caused by the defaultValue feature
Change-Id: Ic0ac644a8b76a546c7470305c334ff27f98f56df
| -rw-r--r-- | ReleaseNotes/ReleaseNotes-2.10.5.txt | 27 | ||||
| -rw-r--r-- | ReleaseNotes/index.txt | 1 | ||||
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java | 16 |
3 files changed, 37 insertions, 7 deletions
diff --git a/ReleaseNotes/ReleaseNotes-2.10.5.txt b/ReleaseNotes/ReleaseNotes-2.10.5.txt new file mode 100644 index 0000000000..eb48c31de3 --- /dev/null +++ b/ReleaseNotes/ReleaseNotes-2.10.5.txt @@ -0,0 +1,27 @@ +Release notes for Gerrit 2.10.5 +=============================== + +There are no schema changes from link:ReleaseNotes-2.10.4.html[2.10.4]. + +Download: +link:https://gerrit-releases.storage.googleapis.com/gerrit-2.10.5.war[ +https://gerrit-releases.storage.googleapis.com/gerrit-2.10.5.war] + +Bug Fixes +--------- + +* Update JGit to include a memory leak fix as discussed +link:https://groups.google.com/forum/#!topic/repo-discuss/RRQT_xCqz4o[here] + +* Attempt to fix the "Cannot read project" issue in Gerrit, as discussed +link:https://groups.google.com/forum/\#!topic/repo-discuss/ZeGWPyyJlrM[here] +and +link:https://groups.google.com/forum/#!topic/repo-discuss/CYYoHfDxCfA[here] + +* Fixed a regression caused by the defaultValue feature which broke the ability +to remove labels in subprojects + +Updates +------- + +* Update JGit to v4.0.0.201506090130-r diff --git a/ReleaseNotes/index.txt b/ReleaseNotes/index.txt index 0ee2a8dcd1..e40a68b4cc 100644 --- a/ReleaseNotes/index.txt +++ b/ReleaseNotes/index.txt @@ -10,6 +10,7 @@ Version 2.11.x [[2_10]] Version 2.10.x -------------- +* link:ReleaseNotes-2.10.5.html[2.10.5] * link:ReleaseNotes-2.10.4.html[2.10.4] * link:ReleaseNotes-2.10.3.1.html[2.10.3.1] * link:ReleaseNotes-2.10.3.html[2.10.3] diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java index 020c94ae71..95f5108d10 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java @@ -682,13 +682,15 @@ public class ProjectConfig extends VersionedMetaData implements ValidationError. label.setFunctionName(null); } - short dv = (short) rc.getInt(LABEL, name, KEY_DEFAULT_VALUE, 0); - if (isInRange(dv, values)) { - label.setDefaultValue(dv); - } else { - error(new ValidationError(PROJECT_CONFIG, String.format( - "Invalid %s \"%s\" for label \"%s\"", - KEY_DEFAULT_VALUE, dv, name))); + if (!values.isEmpty()) { + short dv = (short) rc.getInt(LABEL, name, KEY_DEFAULT_VALUE, 0); + if (isInRange(dv, values)) { + label.setDefaultValue(dv); + } else { + error(new ValidationError(PROJECT_CONFIG, String.format( + "Invalid %s \"%s\" for label \"%s\"", + KEY_DEFAULT_VALUE, dv, name))); + } } label.setCopyMinScore( rc.getBoolean(LABEL, name, KEY_COPY_MIN_SCORE, |