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
..
aggregations	Aggs: Make it possible to configure missing values.	2015-05-15 16:26:58 +02:00
analysis	Docs: Fixed the backslash escaping on the pattern analyzer docs	2015-05-15 18:40:16 +02:00
cat	Removed `id_cache` from stats and cat apis.	2015-05-15 14:06:18 +02:00
cluster	Removed `id_cache` from stats and cat apis.	2015-05-15 14:06:18 +02:00
docs	parent/child: Removed the `top_children` query.	2015-05-10 16:30:19 +02:00
images	[DOCS] Fix movavg images and naming	2015-04-29 13:33:54 -04:00
index-modules	Docs: More translog doc improvements	2015-05-05 22:01:58 +02:00
indices	Merge branch 'master' into feature/synced_flush	2015-05-19 12:16:22 +02:00
mapping	Docs: Cleanup meta field docs	2015-05-07 11:26:49 -07:00
migration	Mappings: Remove the `ignore_conflicts` option.	2015-05-18 15:28:23 +02:00
modules	[DOCS] Add DNS SRV discovery plugin	2015-05-14 16:02:59 -06:00
query-dsl	Removed `id_cache` from stats and cat apis.	2015-05-15 14:06:18 +02:00
search	Highlighting: require_field_match set to true by default	2015-05-15 21:38:45 +02:00
setup	Documentation: Mention RPM repo does not work with older distributions	2015-05-07 08:20:06 +02:00
testing	[DOCS] added instructions on how to write parameterized tests	2015-03-19 12:43:51 +01:00
aggregations.asciidoc	[DOCS] Restructure Aggs documentation	2015-05-01 16:04:55 -04:00
analysis.asciidoc	Add more anchor links to documentation	2013-09-30 13:13:16 -06:00
api-conventions.asciidoc	Docs: Fixed explanation of AUTO fuzziness	2015-05-15 21:25:11 +02:00
cat.asciidoc	[TEST] Add missing docs and tests for '_cat/segments'	2015-01-09 12:29:11 +01:00
cluster.asciidoc	Remove `_shutdown` API	2015-04-27 17:19:36 +02:00
docs.asciidoc	Bulk UDP: Removal.	2014-09-11 09:52:09 +02:00
getting-started.asciidoc	Query DSL: Remove filter parsers.	2015-05-07 20:14:34 +02:00
glossary.asciidoc	Migrated documentation into the main repo	2013-08-29 01:24:34 +02:00
index-modules.asciidoc	Docs: Updated the experimental annotations in the docs as follows:	2015-04-26 18:49:15 +02:00
index.asciidoc	[DOCS] Restructure Aggs documentation	2015-05-01 16:04:55 -04:00
indices.asciidoc	Mappings: Remove delete mapping API	2015-03-24 09:46:02 -07:00
mapping.asciidoc	Mappings: Remove file based default mappings	2015-04-30 13:50:35 -07:00
modules.asciidoc	Remove references to the thrift and memcached transport plugins	2015-03-19 20:49:58 +01:00
query-dsl.asciidoc	Query DSL: Remove filter parsers.	2015-05-07 20:14:34 +02:00
search.asciidoc	More Like This: removal of the MLT API	2015-05-06 18:11:11 +02:00
setup.asciidoc	Docs: Updated elasticsearch.org links to elastic.co	2015-05-01 20:46:12 +02:00
testing.asciidoc	[DOCS] Test framework documentation	2013-12-02 18:01:45 +01:00