From 754c1b44e71db86577d7a69240d77eafb16f8335 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Sun, 16 Aug 2015 10:40:13 -0700 Subject: [PATCH] Fix ZenDiscovery ctor change to remove dynamic cluster settings --- .../java/org/elasticsearch/discovery/ec2/Ec2Discovery.java | 4 ++-- .../org/elasticsearch/discovery/azure/AzureDiscovery.java | 4 ++-- .../java/org/elasticsearch/discovery/gce/GceDiscovery.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/cloud-aws/src/main/java/org/elasticsearch/discovery/ec2/Ec2Discovery.java b/plugins/cloud-aws/src/main/java/org/elasticsearch/discovery/ec2/Ec2Discovery.java index 4c6bc8c116c..b599541604c 100755 --- a/plugins/cloud-aws/src/main/java/org/elasticsearch/discovery/ec2/Ec2Discovery.java +++ b/plugins/cloud-aws/src/main/java/org/elasticsearch/discovery/ec2/Ec2Discovery.java @@ -42,8 +42,8 @@ public class Ec2Discovery extends ZenDiscovery { public Ec2Discovery(Settings settings, ClusterName clusterName, ThreadPool threadPool, TransportService transportService, ClusterService clusterService, NodeSettingsService nodeSettingsService, ZenPingService pingService, DiscoverySettings discoverySettings, - ElectMasterService electMasterService, @ClusterDynamicSettings DynamicSettings dynamicSettings) { + ElectMasterService electMasterService) { super(settings, clusterName, threadPool, transportService, clusterService, nodeSettingsService, - pingService, electMasterService, discoverySettings, dynamicSettings); + pingService, electMasterService, discoverySettings); } } diff --git a/plugins/cloud-azure/src/main/java/org/elasticsearch/discovery/azure/AzureDiscovery.java b/plugins/cloud-azure/src/main/java/org/elasticsearch/discovery/azure/AzureDiscovery.java index b8ea50159a6..ff8b43fc526 100755 --- a/plugins/cloud-azure/src/main/java/org/elasticsearch/discovery/azure/AzureDiscovery.java +++ b/plugins/cloud-azure/src/main/java/org/elasticsearch/discovery/azure/AzureDiscovery.java @@ -43,8 +43,8 @@ public class AzureDiscovery extends ZenDiscovery { @Inject public AzureDiscovery(Settings settings, ClusterName clusterName, ThreadPool threadPool, TransportService transportService, ClusterService clusterService, NodeSettingsService nodeSettingsService, ZenPingService pingService, - DiscoverySettings discoverySettings, ElectMasterService electMasterService, @ClusterDynamicSettings DynamicSettings dynamicSettings) { + DiscoverySettings discoverySettings, ElectMasterService electMasterService) { super(settings, clusterName, threadPool, transportService, clusterService, nodeSettingsService, - pingService, electMasterService, discoverySettings, dynamicSettings); + pingService, electMasterService, discoverySettings); } } diff --git a/plugins/cloud-gce/src/main/java/org/elasticsearch/discovery/gce/GceDiscovery.java b/plugins/cloud-gce/src/main/java/org/elasticsearch/discovery/gce/GceDiscovery.java index 448fca5b1e3..afa6437c0a6 100755 --- a/plugins/cloud-gce/src/main/java/org/elasticsearch/discovery/gce/GceDiscovery.java +++ b/plugins/cloud-gce/src/main/java/org/elasticsearch/discovery/gce/GceDiscovery.java @@ -42,9 +42,9 @@ public class GceDiscovery extends ZenDiscovery { public GceDiscovery(Settings settings, ClusterName clusterName, ThreadPool threadPool, TransportService transportService, ClusterService clusterService, NodeSettingsService nodeSettingsService, ZenPingService pingService, DiscoverySettings discoverySettings, - ElectMasterService electMasterService, @ClusterDynamicSettings DynamicSettings dynamicSettings) { + ElectMasterService electMasterService) { super(settings, clusterName, threadPool, transportService, clusterService, nodeSettingsService, - pingService, electMasterService, discoverySettings, dynamicSettings); + pingService, electMasterService, discoverySettings); // TODO Add again force disable multicast // See related issue in AWS plugin https://github.com/elastic/elasticsearch-cloud-aws/issues/179