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

Fix ZenDiscovery ctor change to remove dynamic cluster settings

This commit is contained in:
Ryan Ernst 2015-08-16 10:40:13 -07:00
parent 581fd16775
commit 754c1b44e7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/cloud-aws/src/main/java/org/elasticsearch/discovery/ec2/Ec2Discovery.java
View File

@ -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);
}
}

4
plugins/cloud-azure/src/main/java/org/elasticsearch/discovery/azure/AzureDiscovery.java
View File

@ -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);
}
}

4
plugins/cloud-gce/src/main/java/org/elasticsearch/discovery/gce/GceDiscovery.java
View File

@ -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