Merge branch 'stable-2.14' into stable-2.15
* stable-2.14: Update Eclipse compiler settings with Oxygen.3a Release (4.7.3a) Introduce mechanism to overload Gerrit core modules Move default memory cache implementation out of H2 package Introduce CacheImpl annotation Untangle persistent/memory cache implementations from each other H2CacheFactory: update internal caches list synchronously Change-Id: I6c0952771b4e630a6628355f8cb2972ab7d12419
This commit is contained in:
@@ -29,7 +29,8 @@ import com.google.gerrit.metrics.MetricMaker;
|
||||
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gerrit.server.GerritPersonIdent;
|
||||
import com.google.gerrit.server.GerritPersonIdentProvider;
|
||||
import com.google.gerrit.server.cache.h2.DefaultCacheFactory;
|
||||
import com.google.gerrit.server.cache.h2.H2CacheModule;
|
||||
import com.google.gerrit.server.cache.mem.DefaultMemoryCacheModule;
|
||||
import com.google.gerrit.server.config.AllProjectsName;
|
||||
import com.google.gerrit.server.config.AllProjectsNameProvider;
|
||||
import com.google.gerrit.server.config.AllUsersName;
|
||||
@@ -215,7 +216,8 @@ public class InMemoryModule extends FactoryModule {
|
||||
return MoreExecutors.newDirectExecutorService();
|
||||
}
|
||||
});
|
||||
install(new DefaultCacheFactory.Module());
|
||||
install(new DefaultMemoryCacheModule());
|
||||
install(new H2CacheModule());
|
||||
install(new FakeEmailSender.Module());
|
||||
install(new SignedTokenEmailTokenVerifier.Module());
|
||||
install(new GpgModule(cfg));
|
||||
|
||||
Reference in New Issue
Block a user