Merge remote-tracking branch 'origin/master'

This commit is contained in:
David Pilato 2015-10-13 09:59:00 +02:00
commit 7557eae9e0
2 changed files with 2 additions and 3 deletions

View File

@ -377,7 +377,7 @@ The ability to specify mappings in configuration files has been removed. To
specify default mappings that apply to multiple indexes, use
<<indices-templates,index templates>> instead.
Along with this change, the following settings have ben removed:
Along with this change, the following settings have been removed:
* `index.mapper.default_mapping_location`
* `index.mapper.default_percolator_mapping_location`

View File

@ -25,7 +25,7 @@ be cacheable. Filter context is introduced by:
aggregations or index aliases
--
As a result of this change, he `execution` option of the `terms` filter is now
As a result of this change, the `execution` option of the `terms` filter is now
deprecated and ignored if provided.
==== `or` and `and` now implemented via `bool`
@ -183,4 +183,3 @@ behaviour using the <<search-request-body,terminate_after>> parameter.
Java plugins that register custom queries can do so by using the
`IndicesQueriesModule#addQuery(Class<? extends QueryParser>)` method. Other
ways to register custom queries are not supported anymore.