Update to elasticsearch master

This commit is contained in:
David Pilato 2014-03-26 20:16:11 +01:00
parent 4f04ded852
commit 3643233670
3 changed files with 9 additions and 11 deletions

View File

@ -12,15 +12,11 @@ In order to install the plugin, simply run: `bin/plugin -install elasticsearch/e
| GCE Cloud Plugin | elasticsearch | gce api | Release date |
|----------------------------|---------------------|--------------|:------------:|
| 2.1.0-SNAPSHOT | 1.0.0.RC1 -> master | 1.17.0-rc | XXXX-XX-XX |
| 2.0.0 | 1.0.0.RC1 -> master | 1.17.0-rc | 2014-03-12 |
| 2.0.0.RC1 | 1.0.0.RC1 -> master | 1.15.0-rc | 2014-01-15 |
| 3.0.0-SNAPSHOT | master | 1.17.0-rc | XXXX-XX-XX |
Please read documentation relative to the version you are using:
* [2.0.1-SNAPSHOT](https://github.com/elasticsearch/elasticsearch-cloud-azure/blob/master/README.md)
* [2.0.0](https://github.com/elasticsearch/elasticsearch-cloud-azure/blob/v2.0.0/README.md)
* [2.0.0.RC1](https://github.com/elasticsearch/elasticsearch-cloud-azure/blob/v2.0.0.RC1/README.md)
* [3.0.0-SNAPSHOT](https://github.com/elasticsearch/elasticsearch-cloud-azure/blob/master/README.md)
Google Compute Engine Virtual Machine Discovery

View File

@ -16,7 +16,7 @@ governing permissions and limitations under the License. -->
<modelVersion>4.0.0</modelVersion>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-cloud-gce</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<name>Elasticsearch Google Compute Engine cloud plugin</name>
<description>The Google Compute Engine (GCE) Cloud plugin allows to use GCE API for the unicast discovery mechanism.</description>
@ -48,10 +48,10 @@ governing permissions and limitations under the License. -->
</issueManagement>
<properties>
<elasticsearch.version>1.0.1</elasticsearch.version>
<elasticsearch.version>2.0.0-SNAPSHOT</elasticsearch.version>
<google.gce.version>v1beta16-rev1-1.17.0-rc</google.gce.version>
<google.api.version>1.17.0-rc</google.api.version>
<lucene.version>4.6.1</lucene.version>
<lucene.version>4.7.0</lucene.version>
<tests.shuffle>true</tests.shuffle>
<tests.output>onerror</tests.output>
<tests.client.ratio></tests.client.ratio>

View File

@ -28,6 +28,7 @@ import org.elasticsearch.common.collect.ImmutableList;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.network.NetworkService;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.discovery.DiscoverySettings;
import org.elasticsearch.discovery.zen.ZenDiscovery;
import org.elasticsearch.discovery.zen.ping.ZenPing;
import org.elasticsearch.discovery.zen.ping.ZenPingService;
@ -45,8 +46,9 @@ public class GceDiscovery extends ZenDiscovery {
public GceDiscovery(Settings settings, ClusterName clusterName, ThreadPool threadPool, TransportService transportService,
ClusterService clusterService, NodeSettingsService nodeSettingsService, ZenPingService pingService,
DiscoveryNodeService discoveryNodeService, GceComputeService gceComputeService,
NetworkService networkService) {
super(settings, clusterName, threadPool, transportService, clusterService, nodeSettingsService, discoveryNodeService, pingService, Version.CURRENT);
NetworkService networkService, DiscoverySettings discoverySettings) {
super(settings, clusterName, threadPool, transportService, clusterService, nodeSettingsService,
discoveryNodeService, pingService, Version.CURRENT, discoverySettings);
if (settings.getAsBoolean("cloud.enabled", true)) {
ImmutableList<? extends ZenPing> zenPings = pingService.zenPings();
UnicastZenPing unicastZenPing = null;