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

Original commit: elastic/x-pack-elasticsearch@45dbf7608d
This commit is contained in:
Igor Motov 2018-01-03 16:53:29 -05:00
commit 3d6e6c92bf
1 changed files with 1 additions and 0 deletions

View File

@ -516,6 +516,7 @@ public class ClusterStatsMonitoringDocTests extends BaseMonitoringDocTestCase<Cl
+ "\"version\":\"_plugin_version\"," + "\"version\":\"_plugin_version\","
+ "\"description\":\"_plugin_desc\"," + "\"description\":\"_plugin_desc\","
+ "\"classname\":\"_plugin_class\"," + "\"classname\":\"_plugin_class\","
+ "\"extended_plugins\":[],"
+ "\"has_native_controller\":false," + "\"has_native_controller\":false,"
+ "\"requires_keystore\":false" + "\"requires_keystore\":false"
+ "}" + "}"