Skip to content

Commit

Permalink
Merge branch 'hotfix/2.0-mappings'
Browse files Browse the repository at this point in the history
  • Loading branch information
tlovett1 committed Nov 9, 2015
2 parents cb5ae5b + 573e2fb commit aaf075b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion elasticpress.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Plugin Name: ElasticPress
* Description: Integrate WordPress search with Elasticsearch
* Version: 1.6
* Version: 1.6.1
* Author: Aaron Holbrook, Taylor Lovett, Matt Gross, 10up
* Author URI: http://10up.com
* License: GPLv2 or later
Expand Down
6 changes: 2 additions & 4 deletions includes/mappings.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,7 @@
),
'post_author' => array(
'type' => 'object',
'path' => 'full',
'fields' => array(
'properties' => array(
'display_name' => array(
'type' => 'string',
'analyzer' => 'standard',
Expand Down Expand Up @@ -229,8 +228,7 @@
),
'date_terms' => array(
'type' => 'object',
'path' => 'full',
'fields' => array(
'properties' => array(
'year' => array( //4 digit year (e.g. 2011)
'type' => 'integer',
),
Expand Down
11 changes: 9 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
=== ElasticPress ===
Contributors: aaronholbrook, tlovett1, 10up
Contributors: aaronholbrook, tlovett1, ChrisWiegman, sc0ttkclark, collinsinternet, 10up
Author URI: http://10up.com
Plugin URI: https://github.com/10up/ElasticPress
Tags: search, elasticsearch, fuzzy, facet, searching, autosuggest, suggest, elastic, advanced search
Requires at least: 3.7.1
Tested up to: 4.4
Stable tag: 1.6
Stable tag: 1.6.1
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -60,6 +60,13 @@ configuring single site and multi-site cross-site search are slightly different.

== Changelog ==

= 1.6.1 =

ElasticPress 1.6.1 fixes mapping backwards compatibility issues with Elasticsearch 2.0:

* Removes the fields field type from object typed fields as they should be called properties.
* Remove path from object field types.

= 1.6 =

ElasticPress 1.6 contains a number of important enhancements and bug fixes. Most notably, we now support Elasticsearch fallback hosts and the indexing of attachments.
Expand Down

0 comments on commit aaf075b

Please sign in to comment.