opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.10'

Browse Source 
* stable-2.10:
  Release notes for Gerrit 2.9.1
  Set version to 2.9.1
  Display parents for all changes, not only merge commits
  Fix JS plugin load when using non-root Gerrit URLs
  Don't require secondary index when running daemon in slave mode
  Remove fixed limit of results returned by secondary index query

Conflicts:
	gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java
	gerrit-server/src/main/java/com/google/gerrit/server/index/IndexRewriteImpl.java

Change-Id: I66a9909edc789ee826f5091ca87044e160a25926
This commit is contained in:
David Pursehouse
2014-09-10 13:12:13 +02:00
parent 13eec766ab 5afd5b8f00
commit ecc535c6ff
14 changed files with 214 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-common/src/main/java/com/google/gerrit/common/data/GlobalCapability.java
View File

@@ -73,6 +73,9 @@ public class GlobalCapability {
/** Maximum result limit per executed query. */
public static final String QUERY_LIMIT = "queryLimit";
/** Default result limit per executed query. */
public static final int DEFAULT_MAX_QUERY_LIMIT = 500;
/** Ability to impersonate another user. */
public static final String RUN_AS = "runAs";
@@ -150,7 +153,7 @@ public class GlobalCapability {
return new PermissionRange.WithDefaults(
varName,
0, Integer.MAX_VALUE,
0, 500);
0, DEFAULT_MAX_QUERY_LIMIT);
}
return null;
}