diff --git a/pom.xml b/pom.xml index 39dc7d4ff53..dc7e33c0df4 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ governing permissions and limitations under the License. --> - 0.90.2 + 0.90.3 v1beta15-rev3-1.15.0-rc 1.15.0-rc diff --git a/src/main/java/org/elasticsearch/discovery/gce/GceDiscovery.java b/src/main/java/org/elasticsearch/discovery/gce/GceDiscovery.java index 717398e97a6..199b9799c8e 100755 --- a/src/main/java/org/elasticsearch/discovery/gce/GceDiscovery.java +++ b/src/main/java/org/elasticsearch/discovery/gce/GceDiscovery.java @@ -19,6 +19,7 @@ package org.elasticsearch.discovery.gce; +import org.elasticsearch.Version; import org.elasticsearch.cloud.gce.GceComputeService; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterService; @@ -45,7 +46,7 @@ public class GceDiscovery extends ZenDiscovery { ClusterService clusterService, NodeSettingsService nodeSettingsService, ZenPingService pingService, DiscoveryNodeService discoveryNodeService, GceComputeService gceComputeService, NetworkService networkService) { - super(settings, clusterName, threadPool, transportService, clusterService, nodeSettingsService, discoveryNodeService, pingService); + super(settings, clusterName, threadPool, transportService, clusterService, nodeSettingsService, discoveryNodeService, pingService, Version.CURRENT); if (settings.getAsBoolean("cloud.enabled", true)) { ImmutableList zenPings = pingService.zenPings(); UnicastZenPing unicastZenPing = null; diff --git a/src/main/java/org/elasticsearch/discovery/gce/GceUnicastHostsProvider.java b/src/main/java/org/elasticsearch/discovery/gce/GceUnicastHostsProvider.java index b163a88fe85..cf07317f5db 100644 --- a/src/main/java/org/elasticsearch/discovery/gce/GceUnicastHostsProvider.java +++ b/src/main/java/org/elasticsearch/discovery/gce/GceUnicastHostsProvider.java @@ -22,6 +22,7 @@ package org.elasticsearch.discovery.gce; import com.google.api.services.compute.model.AccessConfig; import com.google.api.services.compute.model.Instance; import com.google.api.services.compute.model.NetworkInterface; +import org.elasticsearch.Version; import org.elasticsearch.cloud.gce.GceComputeService; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.Strings; @@ -223,7 +224,7 @@ public class GceUnicastHostsProvider extends AbstractComponent implements Unicas for (int i = 0; (i < addresses.length && i < UnicastZenPing.LIMIT_PORTS_COUNT); i++) { logger.trace("adding {}, type {}, image {}, address {}, transport_address {}, status {}", name, type, image, ip_private, addresses[i], status); - cachedDiscoNodes.add(new DiscoveryNode("#cloud-" + name + "-" + i, addresses[i])); + cachedDiscoNodes.add(new DiscoveryNode("#cloud-" + name + "-" + i, addresses[i], Version.CURRENT)); } } } catch (Exception e) {