opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  SshCommandsIT: Include `logging ls` and `logging set` commands
  Add tests to make sure ssh commands can be executed
  Align ElasticIndexModule with LuceneIndexModule
  Revert "Remove unneeded nested MultiVersionModule class"
  Remove unneeded nested MultiVersionModule class
  Only bind index {start/activate} if needed
  InitIndex: Allow to configure index.maxLimit for Elasticsearch

Change-Id: Icf925e3724ca6974831676e505692807a771e70b
This commit is contained in:
David Pursehouse
2018-04-11 13:41:51 +09:00
parent 8a8ab987d6 c57c5cc8f9
commit ff728f249f
8 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java
View File

@@ -82,7 +82,6 @@ public class ElasticIndexModule extends AbstractModule {
} else {
install(new SingleVersionModule(singleVersions));
}
bind(VersionManager.class).to(ElasticVersionManager.class);
}
@Provides
@@ -94,6 +93,7 @@ public class ElasticIndexModule extends AbstractModule {
private class MultiVersionModule extends LifecycleModule {
@Override
public void configure() {
bind(VersionManager.class).to(ElasticVersionManager.class);
listener().to(ElasticVersionManager.class);
if (onlineUpgrade) {
listener().to(OnlineUpgrader.class);