Merge pull request #3 from shinjiikeda/1.6

Update to 1.6.0
grmblfrz · Jul 29, 2015 · 6fc0f52 · 6fc0f52
2 parents 9781220 + 18b19f7
commit 6fc0f52
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/README.textile b/README.textile
@@ -6,6 +6,7 @@ The following table shows the versions of elasticsearch and Apache Zookeeper tha
 
 |_. ES-zk Plugin |_.  Elasticsearch    |_.  Zookeeper  |
 | master         | 1.4.2               | 3.4.6         |
+| 1.6.0          | 1.6.0               | 3.4.6         |
 | 1.4.2          | 1.4.2               | 3.4.6         |
 | 1.4.1          | 1.4.1               | 3.4.6         |
 | 1.3.4          | 1.3.4               | 3.4.6         |

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.4.2</version>
+    <version>1.6.0</version>
     <packaging>jar</packaging>
     <description>ZooKeeper plugin for Elasticsearch</description>
     <inceptionYear>2011</inceptionYear>
@@ -30,7 +30,7 @@
     </parent>
 
     <properties>
-        <elasticsearch.version>1.4.2</elasticsearch.version>
+        <elasticsearch.version>1.6.0</elasticsearch.version>
         <zookeeper.version>3.4.6</zookeeper.version>
     </properties>
 
@@ -165,7 +165,7 @@
             <plugin>
                 <artifactId>jdeb</artifactId>
                 <groupId>org.vafer</groupId>
-                <version>0.9</version>
+                <version>1.0.1</version>
                 <configuration>
                     <deb>${project.build.directory}/releases/${project.artifactId}-${project.version}.deb</deb>
                 </configuration>

diff --git a/src/main/java/com/sonian/elasticsearch/zookeeper/discovery/ZooKeeperClusterState.java b/src/main/java/com/sonian/elasticsearch/zookeeper/discovery/ZooKeeperClusterState.java
@@ -163,7 +163,7 @@ public void onNodeDataChanged(String id) {
             if (stateBuf == null) {
                 return null;
             }
-            final BytesStreamInput buf = new BytesStreamInput(stateBuf, false);
+            final BytesStreamInput buf = new BytesStreamInput(stateBuf);
             Version stateVersion;
             try {
                 stateVersion = Version.readVersion(buf);
@@ -446,7 +446,7 @@ public T internalGetStatePart(final String path, Version version) throws Elastic
 
                 byte[] buf = zooKeeperClient.getLargeNode(path);
                 if (buf != null) {
-                    StreamInput in = new BytesStreamInput(buf, false);
+                    StreamInput in = new BytesStreamInput(buf);
                     in.setVersion(version);
                     return readFrom(in);
                 } else {

diff --git a/src/main/java/com/sonian/elasticsearch/zookeeper/discovery/ZooKeeperDiscovery.java b/src/main/java/com/sonian/elasticsearch/zookeeper/discovery/ZooKeeperDiscovery.java
@@ -572,7 +572,7 @@ public DiscoveryNode nodeInfo(final String id) throws ElasticsearchException, In
         try {
             byte[] buf = zooKeeperClient.getNode(nodePath(id), null);
             if (buf != null) {
-                return DiscoveryNode.readNode(new BytesStreamInput(buf, false));
+                return DiscoveryNode.readNode(new BytesStreamInput(buf));
             } else {
                 return null;
             }