diff --git a/README.md b/README.md index dd778f625d1..9cd8af83396 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ In order to install the plugin, simply run: `bin/plugin -install elasticsearch/e | GCE Cloud Plugin | elasticsearch | gce api | Release date | |----------------------------|---------------------|--------------|:------------:| -| 3.0.0-SNAPSHOT | master | 1.17.0-rc | XXXX-XX-XX | +| 3.0.0-SNAPSHOT | master | 1.18.0-rc | XXXX-XX-XX | Please read documentation relative to the version you are using: diff --git a/pom.xml b/pom.xml index 80ec5cd3bfe..722ef498c2e 100644 --- a/pom.xml +++ b/pom.xml @@ -49,8 +49,8 @@ governing permissions and limitations under the License. --> 2.0.0-SNAPSHOT - v1beta16-rev1-1.17.0-rc - 1.17.0-rc + v1-rev15-1.18.0-rc + 1.18.0-rc 4.7.0 true onerror diff --git a/src/main/java/org/elasticsearch/discovery/gce/GceUnicastHostsProvider.java b/src/main/java/org/elasticsearch/discovery/gce/GceUnicastHostsProvider.java index a0238b00b4f..2a6247e860a 100644 --- a/src/main/java/org/elasticsearch/discovery/gce/GceUnicastHostsProvider.java +++ b/src/main/java/org/elasticsearch/discovery/gce/GceUnicastHostsProvider.java @@ -130,7 +130,6 @@ public class GceUnicastHostsProvider extends AbstractComponent implements Unicas for (Instance instance : instances) { String name = instance.getName(); String type = instance.getMachineType(); - String image = instance.getImage(); String status = instance.getStatus(); logger.trace("gce instance {} with status {} found.", name, status); @@ -227,8 +226,8 @@ public class GceUnicastHostsProvider extends AbstractComponent implements Unicas // If user has set `es_port` metadata, we don't need to ping all ports // we only limit to 1 addresses, makes no sense to ping 100 ports for (int i = 0; i < addresses.length; i++) { - logger.trace("adding {}, type {}, image {}, address {}, transport_address {}, status {}", name, type, - image, ip_private, addresses[i], status); + logger.trace("adding {}, type {}, image {}, address {}, transport_address {}, status {}", name, type + , ip_private, addresses[i], status); cachedDiscoNodes.add(new DiscoveryNode("#cloud-" + name + "-" + i, addresses[i], Version.CURRENT)); } } diff --git a/src/test/java/org/elasticsearch/discovery/gce/GceComputeServiceAbstractMock.java b/src/test/java/org/elasticsearch/discovery/gce/GceComputeServiceAbstractMock.java index 4a13466b0c6..1cbe9bcc55a 100644 --- a/src/test/java/org/elasticsearch/discovery/gce/GceComputeServiceAbstractMock.java +++ b/src/test/java/org/elasticsearch/discovery/gce/GceComputeServiceAbstractMock.java @@ -60,7 +60,6 @@ public abstract class GceComputeServiceAbstractMock extends AbstractLifecycleCom Instance instance = new Instance(); instance.setName("Mock Node " + tags); instance.setMachineType("Mock Type machine"); - instance.setImage("mock-image-type"); instance.setStatus("STARTED"); Tags instanceTags = new Tags(); instanceTags.setItems(tags);