Simon Willnauer fe5a35b68e Merge branch 'master' into pr-10624 ... Conflicts: src/main/java/org/elasticsearch/index/shard/IndexShard.java		2015-05-05 11:46:02 +02:00
..
allocation.asciidoc	Docs: Fixed typos	2015-05-05 10:38:05 +02:00
analysis.asciidoc	[DOCS] Multiple doc fixes	2014-03-07 14:24:58 +01:00
cache.asciidoc	Fixing typo	2014-12-01 10:52:00 +01:00
fielddata.asciidoc	Small grammar fix.	2015-03-17 11:27:13 -07:00
mapper.asciidoc	Mappings: Remove file based default mappings	2015-04-30 13:50:35 -07:00
merge.asciidoc	Docs: Updated the experimental annotations in the docs as follows:	2015-04-26 18:49:15 +02:00
query-cache.asciidoc	Search: Remove the `count` search type.	2015-03-31 11:31:49 +02:00
similarity.asciidoc	add lucene language model similarities (Dirichlet & JelinekMercer)	2014-04-07 10:48:03 +02:00
slowlog.asciidoc	Remove garbage	2014-04-15 17:57:25 +02:00
store.asciidoc	Docs: Updated the experimental annotations in the docs as follows:	2015-04-26 18:49:15 +02:00
translog.asciidoc	Decouple recoveries from engine flush	2015-04-30 23:42:50 +03:00