Merge branch 'master' into feature/query-refactoring

This commit is contained in:
javanna 2015-09-03 14:09:39 +02:00 committed by Luca Cavanna
commit 107a4b14e0
1 changed files with 2 additions and 1 deletions

View File

@ -555,7 +555,6 @@ public class PluginManagerIT extends ESIntegTestCase {
PluginManager.checkForOfficialPlugins("analysis-phonetic");
PluginManager.checkForOfficialPlugins("analysis-smartcn");
PluginManager.checkForOfficialPlugins("analysis-stempel");
PluginManager.checkForOfficialPlugins("cloud-aws");
PluginManager.checkForOfficialPlugins("cloud-azure");
PluginManager.checkForOfficialPlugins("cloud-gce");
PluginManager.checkForOfficialPlugins("delete-by-query");
@ -564,6 +563,8 @@ public class PluginManagerIT extends ESIntegTestCase {
PluginManager.checkForOfficialPlugins("mapper-murmur3");
PluginManager.checkForOfficialPlugins("mapper-size");
PluginManager.checkForOfficialPlugins("discovery-multicast");
PluginManager.checkForOfficialPlugins("discovery-ec2");
PluginManager.checkForOfficialPlugins("repository-s3");
try {
PluginManager.checkForOfficialPlugins("elasticsearch-mapper-attachment");