opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.10'

Browse Source 
* stable-2.10:
  Lowcase table name
  Update version to 2.10-rc0
  Minor updates in 2.9 release notes
  RebaseChange: Fix typo

Conflicts:
	VERSION
	gerrit-extension-api/pom.xml
	gerrit-plugin-api/pom.xml
	gerrit-plugin-archetype/pom.xml
	gerrit-plugin-gwt-archetype/pom.xml
	gerrit-plugin-gwtui/pom.xml
	gerrit-plugin-js-archetype/pom.xml
	gerrit-war/pom.xml

Change-Id: Ib3f8fc223e333f9704b5c50d9284efd3115c0468
This commit is contained in:
David Pursehouse
2014-07-23 12:08:31 +09:00
parent c7e5397b93 536f7e6bd6
commit 5060305a89
3 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java
View File

@@ -185,7 +185,7 @@ public class RebaseChange {
if (patchSetAncestors.size() > 1) {
throw new IOException(
"Cannot rebase a change with multiple parents. Parents commits: "
"Cannot rebase a change with multiple parents. Parent commits: "
+ patchSetAncestors.toString());
}
if (patchSetAncestors.size() == 0) {

2
gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_98.java
View File

@@ -34,7 +34,7 @@ public class Schema_98 extends SchemaVersion {
+ "reviewCategoryStrategy");
Statement stmt = ((JdbcSchema) db).getConnection().createStatement();
try {
stmt.executeUpdate("UPDATE ACCOUNTS SET "
stmt.executeUpdate("UPDATE accounts SET "
+ "REVIEW_CATEGORY_STRATEGY='NAME' "
+ "WHERE (SHOW_USER_IN_REVIEW='Y')");
} finally {