commit 72fdfd81f984288fb56c5e1fd99e1c9a09f0b2ed
author Edwin Kempin <ekempin@google.com> Fri May 06 15:50:18 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 06 15:50:18 2016 +0000
tree 8f7f338035deea591a2045dd21a46d4f3c0a66ba
parent 926ca4d7cb982330c773775841b2fbf6e1a2f7f0
parent 10e5f64f536118857b3b741856cabb3d5729a89f

Merge "Fix documented default value of index.threads"

gerrit-server/src/main/java/com/google/gerrit/server/ssh/NoSshKeyCache.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ssh/NoSshKeyCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/ssh/NoSshKeyCache.java
index ed9b87c..f3250d9 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/ssh/NoSshKeyCache.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/ssh/NoSshKeyCache.java
@@ -18,8 +18,9 @@
 import com.google.gerrit.reviewdb.client.AccountSshKey;
 import com.google.inject.AbstractModule;
 import com.google.inject.Module;
+import com.google.inject.Singleton;
 
-
+@Singleton
 public class NoSshKeyCache implements SshKeyCache, SshKeyCreator {
 
   public static Module module() {

plugins/replication

diff --git a/plugins/replication b/plugins/replication
index a3f9374..4883981 160000
--- a/plugins/replication
+++ b/plugins/replication
@@ -1 +1 @@
-Subproject commit a3f93741618e2bef903f9140dd15d66b5cc4f018
+Subproject commit 4883981228e871f9b58c01197c01d93ded6250d2