Merge branch 'stable-2.11'
* stable-2.11: Update 2.11.1 release notes Update version to 2.10.5 Release notes for 2.10.5 Update reviewnotes plugin to latest revision Bump JGit to v4.0.0.201506090130-r Allow to push a tag that points to a non-commit object ChangeKindCacheImpl: Assume REWORK if we hit LargeObjectException Fixed regression caused by the defaultValue feature Change-Id: I48f61a872c523fdce4f523ebc08dba75a57add52
This commit is contained in:
David Pursehouse
commit
63a0464b08
27
ReleaseNotes/ReleaseNotes-2.10.5.txt
Normal file
27
ReleaseNotes/ReleaseNotes-2.10.5.txt
Normal 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
|
||||
@ -7,7 +7,8 @@ link:https://gerrit-releases.storage.googleapis.com/gerrit-2.11.1.war[
|
||||
https://gerrit-releases.storage.googleapis.com/gerrit-2.11.1.war]
|
||||
|
||||
Gerrit 2.11.1 includes the bug fixes done with
|
||||
link:ReleaseNotes-2.10.4.html[Gerrit 2.10.4]. These bug fixes are *not* listed
|
||||
link:ReleaseNotes-2.10.4.html[Gerrit 2.10.4] and
|
||||
link:ReleaseNotes-2.10.5.html[Gerrit 2.10.5]. These bug fixes are *not* listed
|
||||
in these release notes.
|
||||
|
||||
There are no schema changes from link:ReleaseNotes-2.11.html[2.11].
|
||||
@ -46,7 +47,7 @@ the target branch.
|
||||
Now, instead of indexing interactively, it falls back to a batch thread pool
|
||||
with the number of available logical CPUs.
|
||||
|
||||
* Reduce unnecessary database access when queryng changes.
|
||||
* Reduce unnecessary database access when querying changes.
|
||||
+
|
||||
Searching for changes was retrieving more information than necessary from the
|
||||
database. This has been optimized to reduce database access and make better use
|
||||
@ -70,6 +71,9 @@ Permissions
|
||||
~~~~~~~~~~~
|
||||
|
||||
* Require 'View Plugins' capability to list plugins through SSH.
|
||||
+
|
||||
The 'View Plugins' capability was required to list plugins through the REST API,
|
||||
but not through SSH.
|
||||
|
||||
* Fix project creation with plugin config if user is not project owner.
|
||||
+
|
||||
@ -136,6 +140,16 @@ events after the initial sync.
|
||||
Miscellaneous
|
||||
~~~~~~~~~~~~~
|
||||
|
||||
* link:http://code.google.com/p/gerrit/issues/detail?id=3328[Issue 3328]:
|
||||
Allow to push a tag that points to a non-commit object.
|
||||
+
|
||||
When pushing a tag that points to a non-commit object, like
|
||||
link:https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/tag/?id=v2.6.11[
|
||||
`v2.6.11` on linux-stable] which points to a tree, or
|
||||
link:https://git.eclipse.org/c/jgit/jgit.git/tag/?id=spearce-gpg-pub[
|
||||
`spearce-gpg-pub` on jgit] which points to a blob, Gerrit rejected the push with
|
||||
the error message 'missing object(s)'.
|
||||
|
||||
* link:http://code.google.com/p/gerrit/issues/detail?id=3323[Issue 3323]:
|
||||
Fix internal server error when cloning from a slave while hiding some refs.
|
||||
|
||||
@ -152,6 +166,8 @@ A temporary directory was being created but not removed.
|
||||
* link:http://code.google.com/p/gerrit/issues/detail?id=2791[Issue 2791]:
|
||||
Fix email validation for new TLDs such as `.systems`.
|
||||
|
||||
* Assume change kind is 'rework' if `LargeObjectException` occurs.
|
||||
|
||||
Documentation
|
||||
~~~~~~~~~~~~~
|
||||
|
||||
|
||||
@ -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]
|
||||
|
||||
@ -686,13 +686,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,
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
include_defs('//lib/maven.defs')
|
||||
|
||||
REPO = GERRIT # Leave here even if set to MAVEN_CENTRAL.
|
||||
VERS = '4.0.0.201505191015-rc1.19-g1773002'
|
||||
REPO = MAVEN_CENTRAL # Leave here even if set to MAVEN_CENTRAL.
|
||||
VERS = '4.0.0.201506090130-r'
|
||||
|
||||
maven_jar(
|
||||
name = 'jgit',
|
||||
id = 'org.eclipse.jgit:org.eclipse.jgit:' + VERS,
|
||||
bin_sha1 = '4db24b39dab8dc0e889807383728032945f461be',
|
||||
src_sha1 = '1723a2855f50493b7c0b216aae97909a7ea59962',
|
||||
bin_sha1 = '859b5dbae0372bc0744503b9593119410c0474f2',
|
||||
src_sha1 = '5a7b7e179852c20f6af8581b96cf6441b23025a5',
|
||||
license = 'jgit',
|
||||
repository = REPO,
|
||||
unsign = True,
|
||||
@ -22,7 +22,7 @@ maven_jar(
|
||||
maven_jar(
|
||||
name = 'jgit-servlet',
|
||||
id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + VERS,
|
||||
sha1 = '7bfdbddea56a87f3f2687ae6abf2c5bdae649f0c',
|
||||
sha1 = 'd86da25c9e1042612ebe3be1e027cce4d9a8e4c9',
|
||||
license = 'jgit',
|
||||
repository = REPO,
|
||||
deps = [':jgit'],
|
||||
@ -36,7 +36,7 @@ maven_jar(
|
||||
maven_jar(
|
||||
name = 'jgit-archive',
|
||||
id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + VERS,
|
||||
sha1 = '08fce6b89f6d1e78f99869d542d70899f3be9c9f',
|
||||
sha1 = '3b1f5cefdd65bbe81851f638ee1f461c9cb5df20',
|
||||
license = 'jgit',
|
||||
repository = REPO,
|
||||
deps = [':jgit',
|
||||
@ -53,7 +53,7 @@ maven_jar(
|
||||
maven_jar(
|
||||
name = 'junit',
|
||||
id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + VERS,
|
||||
sha1 = 'a54c16076e6cbdb9113565a82cffa5f268ae8e3b',
|
||||
sha1 = 'e86c5b8ec06624d3cd2b8c11fd0c528281751329',
|
||||
license = 'DO_NOT_DISTRIBUTE',
|
||||
repository = REPO,
|
||||
unsign = True,
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit b5c6f81d979e78fbd734d946b18270ec8319eaf6
|
||||
Subproject commit 5d6522a4adf13dc34a9b9fe573c0a7370d9cf94e
|
||||
Loading…
Reference in New Issue
Block a user