Merge "Allow to apply fixes to a different patchsets"

java/com/google/gerrit/server/config/GerritIsReplicaProvider.java

diff --git a/java/com/google/gerrit/server/config/GerritIsReplicaProvider.java b/java/com/google/gerrit/server/config/GerritIsReplicaProvider.java
index 213cd1c..f242a50 100644
--- a/java/com/google/gerrit/server/config/GerritIsReplicaProvider.java
+++ b/java/com/google/gerrit/server/config/GerritIsReplicaProvider.java
@@ -17,7 +17,6 @@
 import com.google.gerrit.server.util.ReplicaUtil;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-import com.google.inject.Singleton;
 import org.eclipse.jgit.lib.Config;
 
 /**
@@ -25,7 +24,6 @@
  *
  * <p>The returned boolean indicates whether Gerrit is run as a read-only replica.
  */
-@Singleton
 public final class GerritIsReplicaProvider implements Provider<Boolean> {
   private final Config config;
 

java/com/google/gerrit/server/config/GerritServerConfigModule.java

diff --git a/java/com/google/gerrit/server/config/GerritServerConfigModule.java b/java/com/google/gerrit/server/config/GerritServerConfigModule.java
index 8ddcdac..b811834 100644
--- a/java/com/google/gerrit/server/config/GerritServerConfigModule.java
+++ b/java/com/google/gerrit/server/config/GerritServerConfigModule.java
@@ -71,6 +71,7 @@
     bind(SecureStore.class).toProvider(SecureStoreProvider.class).in(SINGLETON);
     bind(Boolean.class)
         .annotatedWith(GerritIsReplica.class)
-        .toProvider(GerritIsReplicaProvider.class);
+        .toProvider(GerritIsReplicaProvider.class)
+        .in(SINGLETON);
   }
 }