From ed562689f7098417bbee52260a7f846ca8d0d08c Mon Sep 17 00:00:00 2001 From: David Pilato Date: Fri, 9 Aug 2013 09:58:38 +0200 Subject: [PATCH] Update to Elasticsearch 0.90.3. Closes #5. --- pom.xml | 2 +- .../java/org/elasticsearch/discovery/gce/GceDiscovery.java | 3 ++- .../elasticsearch/discovery/gce/GceUnicastHostsProvider.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 39dc7d4ff53c0..dc7e33c0df4fe 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 717398e97a67c..199b9799c8e51 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 GceDiscovery(Settings settings, ClusterName clusterName, ThreadPool threa 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 b163a88fe856c..cf07317f5db81 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 @@ 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 List buildDynamicNodes() { 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) {