From 96c280f43ddb96bc0f72849fd47c0347a9a96a6f Mon Sep 17 00:00:00 2001
From: David Pilato <david@pilato.fr>
Date: Wed, 26 Mar 2014 19:33:12 +0100
Subject: [PATCH] Update to elasticsearch 1.1.0

Closes #11.
---
 pom.xml                                                    | 4 ++--
 .../org/elasticsearch/discovery/azure/AzureDiscovery.java  | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index afb2e0a71a9..3b5e36facb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,8 +43,8 @@ governing permissions and limitations under the License. -->
     </parent>
 
     <properties>
-        <elasticsearch.version>1.0.0</elasticsearch.version>
-        <lucene.version>4.6.1</lucene.version>
+        <elasticsearch.version>1.1.0</elasticsearch.version>
+        <lucene.version>4.7.0</lucene.version>
         <tests.output>onerror</tests.output>
         <tests.jvms>1</tests.jvms>
         <tests.shuffle>true</tests.shuffle>
diff --git a/src/main/java/org/elasticsearch/discovery/azure/AzureDiscovery.java b/src/main/java/org/elasticsearch/discovery/azure/AzureDiscovery.java
index 51f8b991d0d..155ce477820 100755
--- a/src/main/java/org/elasticsearch/discovery/azure/AzureDiscovery.java
+++ b/src/main/java/org/elasticsearch/discovery/azure/AzureDiscovery.java
@@ -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;
@@ -46,8 +47,10 @@ public class AzureDiscovery extends ZenDiscovery {
     @Inject
     public AzureDiscovery(Settings settings, ClusterName clusterName, ThreadPool threadPool, TransportService transportService,
                           ClusterService clusterService, NodeSettingsService nodeSettingsService, ZenPingService pingService,
-                          DiscoveryNodeService discoveryNodeService, AzureComputeService azureService, NetworkService networkService) {
-        super(settings, clusterName, threadPool, transportService, clusterService, nodeSettingsService, discoveryNodeService, pingService, Version.CURRENT);
+                          DiscoveryNodeService discoveryNodeService, AzureComputeService azureService, 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;