Release version 1.3.4 (compatibility with elasticsearch-1.3.4)

grmblfrz · Oct 30, 2014 · a4d5b7d · a4d5b7d
1 parent 310e9ec
commit a4d5b7d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/README.textile b/README.textile
@@ -5,7 +5,8 @@ h2. Compatibility
 The following table shows the versions of elasticsearch and Apache Zookeeper that Zookeeper Plugin was built with.
 
 |_. ES-zk Plugin |_.  Elasticsearch    |_.  Zookeeper  |
-| master         | 1.3.2               | 3.4.6         |
+| master         | 1.3.4               | 3.4.6         |
+| 1.3.4          | 1.3.4               | 3.4.6         |
 | 1.3.1          | 1.3.2               | 3.4.6         |
 | 1.3.0          | 1.3.1               | 3.4.6         |
 | 1.2.3          | 1.2.3               | 3.4.6         |
@@ -22,7 +23,7 @@ h3. Installation
 * Install ZooKeeper plugin to ES by running
 
 <pre>
-% bin/plugin -url https://github.com/grmblfrz/elasticsearch-zookeeper/releases/download/v1.3.0/elasticsearch-zookeeper-1.3.0.zip -install zookeeper
+% bin/plugin -url https://github.com/grmblfrz/elasticsearch-zookeeper/releases/download/v1.3.4/elasticsearch-zookeeper-1.3.4.zip -install zookeeper
 </pre>
 
 * Assuming that you are running ZooKeeper on the port 2181 (default), add the following lines to config/elasticsearch.yml file

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sonian</groupId>
     <artifactId>elasticsearch-zookeeper</artifactId>
-    <version>1.3.1</version>
+    <version>1.3.4</version>
     <packaging>jar</packaging>
     <description>ZooKeeper plugin for Elasticsearch</description>
     <inceptionYear>2011</inceptionYear>
@@ -30,7 +30,7 @@
     </parent>
 
     <properties>
-        <elasticsearch.version>1.3.2</elasticsearch.version>
+        <elasticsearch.version>1.3.4</elasticsearch.version>
         <zookeeper.version>3.4.6</zookeeper.version>
     </properties>
 

diff --git a/src/main/java/com/sonian/elasticsearch/zookeeper/discovery/ZooKeeperDiscovery.java b/src/main/java/com/sonian/elasticsearch/zookeeper/discovery/ZooKeeperDiscovery.java
@@ -117,7 +117,7 @@ public class ZooKeeperDiscovery extends AbstractLifecycleComponent<Discovery> im
         if (componentSettings.getAsBoolean("state_publishing.enabled", false)) {
             statePublisher = new ZooKeeperStatePublisher(settings, environment, zooKeeperClient, this);
         } else {
-            statePublisher = new ZenStatePublisher(settings, transportService, this, new NewClusterStateListener(), discoverySettings);
+            statePublisher = new ZenStatePublisher(settings, transportService, this, new NewClusterStateListener(), discoverySettings, clusterName);
         }
     }
 
@@ -696,8 +696,8 @@ private class ZenStatePublisher implements StatePublisher {
         private final PublishClusterStateAction publishClusterState;
 
         public ZenStatePublisher(Settings settings, TransportService transportService, DiscoveryNodesProvider nodesProvider,
-                                 NewClusterStateListener listener, DiscoverySettings discoverySettings) {
-            publishClusterState = new PublishClusterStateAction(settings, transportService, nodesProvider, listener, discoverySettings);
+                                 NewClusterStateListener listener, DiscoverySettings discoverySettings, ClusterName clusterName) {
+            publishClusterState = new PublishClusterStateAction(settings, transportService, nodesProvider, listener, discoverySettings, clusterName);
         }
 
         @Override public void start() {