diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2018-04-05 20:42:57 +0100 |
|---|---|---|
| committer | David Pursehouse <dpursehouse@collab.net> | 2018-04-05 20:42:57 +0100 |
| commit | 387c219a652b79a839429786525d596fcd633caf (patch) | |
| tree | 22a2dfb589af5338b39570b51cb0f165cde408ed | |
| parent | 15dc9428237c0b605400f5b9236023e8d6ae521e (diff) | |
| parent | 06b41b422d41217b5586c771d4e71da65c3d8919 (diff) | |
Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Fix index ssh commands with elasticsearch type
Change-Id: I52384174fbfc63d4b54df7ff9676c0fc2f0bbbe2
| -rw-r--r-- | gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java | 2 | ||||
| -rw-r--r-- | gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java index 6b5c1574b8..e05db354d3 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java @@ -532,7 +532,7 @@ public class Daemon extends SiteProgram { slave, sysInjector.getInstance(DownloadConfig.class), sysInjector.getInstance(LfsPluginAuthCommand.Module.class))); - if (!slave && indexType == IndexType.LUCENE) { + if (!slave) { modules.add(new IndexCommandsModule()); } return sysInjector.createChildInjector(modules); diff --git a/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java b/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java index 9a02fcdfee..b11cd777f2 100644 --- a/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java +++ b/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java @@ -395,9 +395,7 @@ public class WebAppInitializer extends GuiceServletContextListener implements Fi false, sysInjector.getInstance(DownloadConfig.class), sysInjector.getInstance(LfsPluginAuthCommand.Module.class))); - if (indexType == IndexType.LUCENE) { - modules.add(new IndexCommandsModule()); - } + modules.add(new IndexCommandsModule()); return sysInjector.createChildInjector(modules); } |