From 18b82188a2264e91c57d7ff7831e2186a2a6f519 Mon Sep 17 00:00:00 2001 From: Ruflin Date: Mon, 11 May 2015 10:29:26 +0200 Subject: [PATCH 1/2] Update elasticsearch dependency to version 1.5.2 --- README.markdown | 2 +- ansible/es-playbook.yml | 2 +- changes.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.markdown b/README.markdown index 0329efaa80..d5461891f1 100644 --- 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 index b2b9d0dd0c..7507554009 100644 --- 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 index dd9beaa337..ed8eeec310 100644 --- 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 - Add testing on PHP 7 on Travis #826 2015-05-06 From c36c68cfe872107a1ae6372a669117750bb89875 Mon Sep 17 00:00:00 2001 From: Ruflin Date: Mon, 11 May 2015 10:41:19 +0200 Subject: [PATCH 2/2] Add pull request id to changes.txt #834 --- changes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes.txt b/changes.txt index ed8eeec310..d2fa0c2e9a 100644 --- a/changes.txt +++ b/changes.txt @@ -1,7 +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 +- 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