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

Original commit: elastic/x-pack-elasticsearch@45dbf7608d
2018-01-03 16:53:29 -05:00 · 2018-01-03 16:53:29 -05:00 · 3d6e6c92bf
parent f575119a8d b05ee6fcc9
commit 3d6e6c92bf
1 changed files with 1 additions and 0 deletions
--- a/plugin/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDocTests.java
+++ b/plugin/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDocTests.java
@ -516,6 +516,7 @@ public class ClusterStatsMonitoringDocTests extends BaseMonitoringDocTestCase<Cl
                          + "\"version\":\"_plugin_version\","
                          + "\"description\":\"_plugin_desc\","
                          + "\"classname\":\"_plugin_class\","
+                          + "\"extended_plugins\":[],"
                          + "\"has_native_controller\":false,"
                          + "\"requires_keystore\":false"
                        + "}"