release 2.1.1-1

strapdata · Feb 3, 2016 · 60ff3b8 · 60ff3b8
1 parent cedc49b
commit 60ff3b8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -41,3 +41,4 @@
 
 2.1.1-1 - 2016-02-03
   * Add support for parent-child relation-ship
+  * Bug fix when indexing inet type (Internet Address).
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.elassandra</groupId>
     <artifactId>elassandra</artifactId>
-    <version>2.1.1-1</version>
+    <version>2.1.1</version>
     <name>Elassandra: Core</name>
     <description>Elassandra - ElasticSearch for Cassandra</description>
 

diff --git a/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java
@@ -40,6 +40,7 @@
 import org.elasticsearch.common.Explicit;
 import org.elasticsearch.common.Numbers;
 import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.network.NetworkAddress;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.Fuzziness;
 import org.elasticsearch.common.xcontent.XContentBuilder;
@@ -181,7 +182,7 @@ public Long value(Object value) {
                 return null;
             }
             if (value instanceof InetAddress) {
-                return ipToLong( ((InetAddress) value).getHostAddress() );
+                return ipToLong( NetworkAddress.formatAddress((InetAddress)value));
             }
             if (value instanceof Number) {
                 return ((Number) value).longValue();