opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.10' into stable-2.11

Browse Source 
* 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
This commit is contained in:
David Pursehouse 2015-06-12 10:53:00 +09:00
commit 84db9670c0
3 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ReleaseNotes/ReleaseNotes-2.10.5.txt Normal file
View File

@ -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

1
ReleaseNotes/index.txt
View File

@ -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]

16
gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java
View File

@ -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,