honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-03 09:29:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to Elasticsearch 0.90.3.

Browse Source 
Closes #5.
This commit is contained in:
David Pilato 2013-08-09 09:58:38 +02:00
parent b04b24c91a
commit ed562689f7
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -47,7 +47,7 @@ governing permissions and limitations under the License. -->
</issueManagement>
<properties>
<elasticsearch.version>0.90.2</elasticsearch.version>
<elasticsearch.version>0.90.3</elasticsearch.version>
<google.gce.version>v1beta15-rev3-1.15.0-rc</google.gce.version>
<google.api.version>1.15.0-rc</google.api.version>
</properties>

3
src/main/java/org/elasticsearch/discovery/gce/GceDiscovery.java
View File

@ -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<? extends ZenPing> zenPings = pingService.zenPings();
UnicastZenPing unicastZenPing = null;

3
src/main/java/org/elasticsearch/discovery/gce/GceUnicastHostsProvider.java
View File

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