Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update elasticseach-image to work with ES 1.7.1 #907

Merged
merged 1 commit into from
Aug 7, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ Dependencies
|[Elasticsearch thrift transport plugin](https://github.com/elasticsearch/elasticsearch-transport-thrift/tree/v2.7.0)|2.7.0|no|
|[Elasticsearch memcached transport plugin](https://github.com/elastic/elasticsearch-transport-memcached/tree/v2.7.0)|2.7.0|no|
|[Elasticsearch geocluster facet plugin](https://github.com/zenobase/geocluster-facet/tree/0.0.12)|0.0.12|no|
|[Elasticsearch image plugin](https://github.com/SibaTokyo/elasticsearch-image/tree/1.4.0)|1.4.0|no|
|[Elasticsearch image plugin](https://github.com/Jmoati/elasticsearch-image/releases/tag/1.7.1)|1.7.1|no|
2 changes: 1 addition & 1 deletion ansible/es-playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- ES_TRANSPORT_MEMCACHED_VER: "2.7.0"
- ES_TRANSPORT_THRIFT_VER: "2.7.0"
- ES_GEOCLUSTER_FACET_VER: "0.0.12"
- ES_IMAGE_PLUGIN_VER: "1.4.0"
- ES_IMAGE_PLUGIN_VER: "1.7.1"
- ES_PROJECT_ROOT: "{{ lookup('env', 'ES_PROJECT_ROOT') }}"
roles:
- base
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/elasticsearch/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
- name: install image plugin
command: >
creates=/usr/share/elasticsearch/plugins/image
/usr/share/elasticsearch/bin/plugin --url https://github.com/SibaTokyo/elasticsearch-image/releases/download/{{ ES_IMAGE_PLUGIN_VER }}/elasticsearch-image-{{ ES_IMAGE_PLUGIN_VER }}.zip -install image
/usr/share/elasticsearch/bin/plugin --url https://github.com/Jmoati/elasticsearch-image/releases/download/{{ ES_IMAGE_PLUGIN_VER }}/elasticsearch-image-{{ ES_IMAGE_PLUGIN_VER }}.zip -install image

- name: install mapper-attachments plugin
command: >
Expand Down
4 changes: 2 additions & 2 deletions lib/Elastica/Query/Image.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
* To use this feature you have to call the following command in the
* elasticsearch directory:
* <code>
* ./bin/plugin --url https://github.com/SibaTokyo/elasticsearch-image/releases/download/1.4.0/elasticsearch-image-1.4.0.zip --install image
* ./bin/plugin --url https://github.com/Jmoati/elasticsearch-image/releases/download/1.7.1/elasticsearch-image-1.7.1.zip --install image
* </code>
* This installs the image plugin. More infos
* can be found here: {@link https://github.com/SibaTokyo/elasticsearch-image}
* can be found here: {@link https://github.com/Jmoati/elasticsearch-image}
*/
class Image extends AbstractQuery
{
Expand Down
3 changes: 0 additions & 3 deletions test/lib/Elastica/Test/Query/ImageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ public function testToArrayFromImage()
*/
public function testFromReference()
{
$this->markTestSkipped('Tests skipped as plugin not working properly with ES 1.6.0. See https://github.com/ruflin/Elastica/pull/881');
$field = 'image';

$client = $this->_getClient();
Expand Down Expand Up @@ -113,8 +112,6 @@ public function testFromReference()
*/
public function testFromImage()
{
$this->markTestSkipped('Tests skipped as plugin not working properly with ES 1.6.0. See https://github.com/ruflin/Elastica/pull/881');

$field = 'image';

$client = $this->_getClient();
Expand Down