honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'elastic/master' into feature/sql_2 

Original commit: elastic/x-pack-elasticsearch@00fa90b320
This commit is contained in:
Igor Motov 2018-01-03 15:59:36 -05:00
parent db1693ea20 2e2cce5db5
commit d97d525d46
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDocTests.java
View File

@ -52,6 +52,7 @@ import org.junit.Before;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@ -271,7 +272,8 @@ public class ClusterStatsMonitoringDocTests extends BaseMonitoringDocTestCase<Cl
final PluginsAndModules mockPluginsAndModules = mock(PluginsAndModules.class);
when(mockNodeInfo.getPlugins()).thenReturn(mockPluginsAndModules);
final PluginInfo pluginInfo = new PluginInfo("_plugin", "_plugin_desc", "_plugin_version", "_plugin_class", false, false);
final PluginInfo pluginInfo = new PluginInfo("_plugin", "_plugin_desc", "_plugin_version", "_plugin_class",
Collections.emptyList(), false, false);
when(mockPluginsAndModules.getPluginInfos()).thenReturn(singletonList(pluginInfo));
final OsInfo mockOsInfo = mock(OsInfo.class);