From f8fb7f11eb7c8c0dc967641b4a0aabdc22b4e4c6 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sun, 31 Jan 2016 12:16:55 +0100 Subject: [PATCH] Old DownloadCommand class must be used in intermediate upgrade phase To support zero downtime upgrade, move of user preferences data from database to git backend is implemented in two phases. In second phase the class AccountGeneralPreferences is dropped and replaced with GeneralPreferencesInfo class. In DownloadConfig this replacement was erroneously done already in the first phase: I218d9246. This broke download-commands plugin. Restore the old class and postpose it replacement in the phase 2 of migration. Bug: Issue 3858 Change-Id: I70dbf4ce39239871fc2f67161f22eb402a83b2f5 --- .../java/com/google/gerrit/server/config/DownloadConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/DownloadConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/DownloadConfig.java index c1c5910275..f435a2b8f2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/DownloadConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/DownloadConfig.java @@ -15,7 +15,7 @@ package com.google.gerrit.server.config; import com.google.common.collect.ImmutableSet; -import com.google.gerrit.extensions.client.GeneralPreferencesInfo.DownloadCommand; +import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadCommand; import com.google.gerrit.reviewdb.client.CoreDownloadSchemes; import com.google.gerrit.server.change.ArchiveFormat; import com.google.inject.Inject;