Simon Willnauer 9d2852f0ab Merge branch 'master' into feature/synced_flush ...

Conflicts:
	src/main/java/org/elasticsearch/index/engine/InternalEngine.java
	src/main/java/org/elasticsearch/index/shard/IndexShard.java
	src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java
	src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java

2015-05-19 12:16:22 +02:00

..

aliases.asciidoc

[DOCS] add -i flag to more curl HEAD calls

2015-03-21 08:56:20 +01:00

analyze.asciidoc

Analysis: Add multi-valued text support

2015-05-15 20:01:10 +09:00

clearcache.asciidoc

Removed id_cache from stats and cat apis.

2015-05-15 14:06:18 +02:00

create-index.asciidoc

Docs: Removed all the added/deprecated tags from 1.x

2014-09-26 21:04:42 +02:00

delete-index.asciidoc

Added action.destructive_requires_name that controls whether wildcard expressions and _all is allowed to be used for destructive operat Also the delete index api requires always an index to be specified (either concrete index, alias or wildcard expression)

2014-01-09 11:36:50 +01:00

flush.asciidoc

[ENGINE] Remove full flush / FlushType.NEW_WRITER

2015-02-04 17:38:05 +01:00

get-field-mapping.asciidoc

Mappings: Remove support for new indexes using path setting in

2015-02-05 12:44:43 -08:00

get-index.asciidoc

Indices API: Added GET Index API

2014-09-11 11:19:21 +01:00

get-mapping.asciidoc

Docs: Removed all the added/deprecated tags from 1.x

2014-09-26 21:04:42 +02:00

get-settings.asciidoc

Consistent REST API changes for GETting data

2014-01-14 22:33:52 +01:00

indices-exists.asciidoc

[DOCS] add -i flag to more curl HEAD calls

2015-03-21 08:56:20 +01:00

open-close.asciidoc

Added action.destructive_requires_name that controls whether wildcard expressions and _all is allowed to be used for destructive operat Also the delete index api requires always an index to be specified (either concrete index, alias or wildcard expression)

2014-01-09 11:36:50 +01:00

optimize.asciidoc

Core: Remove ability to run optimize and upgrade async

2015-02-11 11:30:27 -08:00

put-mapping.asciidoc

Mappings: Remove the ignore_conflicts option.

2015-05-18 15:28:23 +02:00

recovery.asciidoc

Docs: Updated version annotations in master

2015-04-09 14:50:11 +02:00

refresh.asciidoc

Rename RobinEngine and friends to InternalEngine

2014-01-13 15:49:10 +01:00

seal.asciidoc

doc for seal api and doc for syned flush in general

2015-05-13 15:43:05 +02:00

segments.asciidoc

Docs: Updated the experimental annotations in the docs as follows:

2015-04-26 18:49:15 +02:00

shadow-replicas.asciidoc

Add shadow replicas for shared filesystems

2015-02-18 15:34:06 -07:00

stats.asciidoc

Filter indices stats for translog

2015-03-20 14:38:49 -07:00

templates.asciidoc

Settings: Remove file based index templates

2015-05-11 12:51:22 -07:00

types-exists.asciidoc

[DOCS] add -i flag to curl HEAD call

2015-03-21 08:56:12 +01:00

update-settings.asciidoc

Docs: Updated the experimental annotations in the docs as follows:

2015-04-26 18:49:15 +02:00

upgrade.asciidoc

Core: add only_ancient_segments to upgrade API, so only segments with an old Lucene version are upgraded

2015-04-16 05:24:33 -04:00

warmers.asciidoc

Docs: Removed all the added/deprecated tags from 1.x

2014-09-26 21:04:42 +02:00