opendev/gerrit
Code Issues Proposed changes

Merge "Add extension point to allow custom merge super set computations"

Browse Source
This commit is contained in:
Edwin Kempin
2017-10-12 12:05:02 +00:00
committed by Gerrit Code Review
parent 9908f63e04 19e89c86f0
commit 31ca238f9c
8 changed files with 362 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
View File

@@ -66,6 +66,7 @@ import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.RestCacheAdminModule;
import com.google.gerrit.server.events.StreamEventsApiListener;
import com.google.gerrit.server.git.GarbageCollectionModule;
import com.google.gerrit.server.git.LocalMergeSuperSetComputation;
import com.google.gerrit.server.git.SearchingChangeCacheImpl;
import com.google.gerrit.server.git.WorkQueue;
import com.google.gerrit.server.git.receive.ReceiveCommitsExecutorModule;
@@ -472,6 +473,7 @@ public class Daemon extends SiteProgram {
if (testSysModule != null) {
modules.add(testSysModule);
}
modules.add(new LocalMergeSuperSetComputation.Module());
return cfgInjector.createChildInjector(modules);
}