Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Make wording of "Merged" html and text templates consistent
  BaseInit: Don't throw if schema cannot be upgraded

Change-Id: If5f1230a893c644b07b899aa1e1403c01cc5f6d5

3 files changed, 2 insertions, 10 deletions

diff --git a/java/com/google/gerrit/pgm/init/BaseInit.java b/java/com/google/gerrit/pgm/init/BaseInit.java
index d5e568d56c..34b2c490e9 100644
--- a/java/com/google/gerrit/pgm/init/BaseInit.java
+++ b/java/com/google/gerrit/pgm/init/BaseInit.java
@@ -36,7 +36,6 @@ import com.google.gerrit.pgm.init.index.elasticsearch.ElasticIndexModuleOnInit;
 import com.google.gerrit.pgm.init.index.lucene.LuceneIndexModuleOnInit;
 import com.google.gerrit.pgm.util.SiteProgram;
 import com.google.gerrit.reviewdb.server.ReviewDb;
-import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.gerrit.server.config.GerritServerConfigModule;
 import com.google.gerrit.server.config.SitePath;
 import com.google.gerrit.server.config.SitePaths;
@@ -59,7 +58,6 @@ import com.google.inject.CreationException;
 import com.google.inject.Guice;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
-import com.google.inject.Key;
 import com.google.inject.Module;
 import com.google.inject.Provider;
 import com.google.inject.TypeLiteral;
@@ -78,7 +76,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import javax.sql.DataSource;
-import org.eclipse.jgit.lib.Config;
 
 /** Initialize a new Gerrit installation. */
 public class BaseInit extends SiteProgram {
@@ -90,7 +87,6 @@ public class BaseInit extends SiteProgram {
   private final List<String> pluginsToInstall;
 
   private Injector sysInjector;
-  private Config config;
 
   protected BaseInit(PluginsDistribution pluginsDistribution, List<String> pluginsToInstall) {
     this.standalone = true;
@@ -148,9 +144,6 @@ public class BaseInit extends SiteProgram {
         try {
           run.upgradeSchema();
         } catch (OrmException e) {
-          if (config.getBoolean("container", "slave", false)) {
-            throw e;
-          }
           String msg = "Couldn't upgrade schema. Expected if slave and read-only database";
           System.err.println(msg);
           logger.atWarning().withCause(e).log(msg);
@@ -474,7 +467,6 @@ public class BaseInit extends SiteProgram {
             }
           });
       Injector dbInjector = createDbInjector(SINGLE_USER);
-      config = dbInjector.getInstance(Key.get(Config.class, GerritServerConfig.class));
 
       switch (IndexModule.getIndexType(dbInjector)) {
         case LUCENE:
diff --git a/resources/com/google/gerrit/server/mail/Merged.soy b/resources/com/google/gerrit/server/mail/Merged.soy
index 40924e60bd..47bfaf2ebc 100644
--- a/resources/com/google/gerrit/server/mail/Merged.soy
+++ b/resources/com/google/gerrit/server/mail/Merged.soy
@@ -25,7 +25,7 @@
  * @param fromName
  */
 {template .Merged kind="text"}
-  {$fromName} has submitted this change and it was merged.
+  {$fromName} has submitted this change.
   {if $email.changeUrl} ( {$email.changeUrl} ){/if}{\n}
   {\n}
   Change subject: {$change.subject}{\n}
diff --git a/resources/com/google/gerrit/server/mail/MergedHtml.soy b/resources/com/google/gerrit/server/mail/MergedHtml.soy
index b11c5e5454..c51be96747 100644
--- a/resources/com/google/gerrit/server/mail/MergedHtml.soy
+++ b/resources/com/google/gerrit/server/mail/MergedHtml.soy
@@ -23,7 +23,7 @@
  */
 {template .MergedHtml}
   <p>
-    {$fromName} <strong>merged</strong> this change.
+    {$fromName} <strong>submitted</strong> this change.
   </p>
 
   {if $email.changeUrl}