opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.13' into stable-2.14

Browse Source 
* stable-2.13:
  Clarify documentation for accountPatchReviewDb.url
  Remove unneeded output in MigrateAccountPatchReviewDb

Change-Id: Ic64d2cbd158b2b88961c48d2d6b35752553335e2
This commit is contained in:
David Pursehouse
2017-04-26 12:11:29 +02:00
parent ebc3870a83 3e1d4cde3f
commit a4cf851fb7
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/config-gerrit.txt
View File

@@ -31,8 +31,8 @@ driver of the corresponding Database is not yet in the class path.
Default is to create H2 database in the db folder of the site path. Default is to create H2 database in the db folder of the site path.
+ +
Changing this parameter requires to migrate database using the Changing this parameter requires to migrate database using the
link:pgm-MigrateAccountPatchReviewDb.html[MigrateAccountPatchReviewDb program] link:pgm-MigrateAccountPatchReviewDb.html[MigrateAccountPatchReviewDb] program.
before restarting the Gerrit server. Migration cannot be done while the server is running.
---- ----
[accountPatchReviewDb] [accountPatchReviewDb]

1
gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateAccountPatchReviewDb.java
View File

@@ -50,7 +50,6 @@ public class MigrateAccountPatchReviewDb extends SiteProgram {
SitePaths sitePaths = new SitePaths(getSitePath()); SitePaths sitePaths = new SitePaths(getSitePath());
Config fakeCfg = new Config(); Config fakeCfg = new Config();
if (!Strings.isNullOrEmpty(sourceUrl)) { if (!Strings.isNullOrEmpty(sourceUrl)) {
System.out.println("source Url (custom): " + sourceUrl);
fakeCfg.setString("accountPatchReviewDb", null, "url", sourceUrl); fakeCfg.setString("accountPatchReviewDb", null, "url", sourceUrl);
} }
JdbcAccountPatchReviewStore sourceJdbcAccountPatchReviewStore = JdbcAccountPatchReviewStore sourceJdbcAccountPatchReviewStore =