Merge pull request #834 from ruflin/elasticsearch-1.5.2

Update elasticsearch dependency to version 1.5.2
ruflin · May 11, 2015 · 6eb6a31 · 6eb6a31
2 parents 1d63a71 + c36c68c
commit 6eb6a31
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/README.markdown b/README.markdown
@@ -22,7 +22,7 @@ Dependencies
 ------------
 | Project | Version | Required |
 |---------|---------|----------|
-|[Elasticsearch](https://github.com/elasticsearch/elasticsearch/tree/v1.5.0)|1.5.0|yes|
+|[Elasticsearch](https://github.com/elasticsearch/elasticsearch/tree/v1.5.2)|1.5.2|yes|
 |[Elasticsearch mapper attachments plugin](https://github.com/elasticsearch/elasticsearch-mapper-attachments/tree/v2.5.0)|2.5.0|no|
 |[Elasticsearch thrift transport plugin](https://github.com/elasticsearch/elasticsearch-transport-thrift/tree/v2.5.0)|2.5.0|no|
 |[Elasticsearch memcached transport plugin](https://github.com/elasticsearch/elasticsearch-transport-memcached/tree/v2.5.0)|2.5.0|no|

diff --git a/ansible/es-playbook.yml b/ansible/es-playbook.yml
@@ -5,7 +5,7 @@
   hosts: localhost
   sudo: true
   vars:
-    - ES_VER: "1.5.0"
+    - ES_VER: "1.5.2"
     - ES_SHORT_VER: "1.5"
     - ES_MAPPER_ATTACHMENTS_VER: "2.5.0"
     - ES_TRANSPORT_MEMCACHED_VER: "2.5.0"

diff --git a/changes.txt b/changes.txt
@@ -1,6 +1,7 @@
 CHANGES
 
 2015-05-11
+- Update elasticsearch dependency to elasticsearch 1.5.2 https://www.elastic.co/downloads/past-releases/elasticsearch-1-5-2 #834
 - Add testing on PHP 7 on Travis #826
 
 2015-05-06