Merge from master

jschavey · Jan 13, 2016 · 902fffb · 902fffb
1 parent 1f826ae
commit 902fffb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.couchbase</groupId>
   <artifactId>elasticsearch-transport-couchbase</artifactId>
-  <version>2.2.0.2</version>
+  <version>2.2.1.2</version>
     <properties>
         <elasticsearch.version>2.1.0</elasticsearch.version>
     </properties>

diff --git a/src/main/plugin-metadata/plugin-descriptor.properties b/src/main/plugin-metadata/plugin-descriptor.properties
@@ -34,7 +34,7 @@
 description=Couchbase to Elasticsearch Transport
 #
 # 'version': plugin's version
-version=2.2.0.2
+version=2.2.1.2
 #
 # 'name': the plugin name
 name=transport-couchbase
@@ -65,7 +65,7 @@ java.version=1.7
 # elasticsearch release. This version is checked when the plugin
 # is loaded so Elasticsearch will refuse to start in the presence of
 # plugins with the incorrect elasticsearch.version.
-elasticsearch.version=2.1.0
+elasticsearch.version=2.1.1
 #
 ### deprecated elements for jvm plugins :
 #