javanna 34de79370f Merge branch 'master' into feature/query-refactoring ...

Conflicts:
	core/src/main/java/org/elasticsearch/ElasticsearchException.java

2015-09-25 09:38:24 +02:00

..

migrate_2_0

Update settings.asciidoc

2015-09-23 14:54:51 +02:00

index.asciidoc

Remove the scan and count search types.

2015-09-07 15:18:45 +02:00

migrate_1_0.asciidoc

Docs: Remove docs for the filtered, and, or and (f)query queries.

2015-09-11 11:00:54 +02:00

migrate_1_4.asciidoc

Query DSL: Remove filter parsers.

2015-05-07 20:14:34 +02:00

migrate_1_6.asciidoc

parent/child: Deprecated the top_children in favour of the has_child query.

2015-05-07 09:27:54 +02:00

migrate_2_0.asciidoc

Mapping: Default position_offset_gap to 100

2015-08-25 14:21:50 -04:00

migrate_2_1.asciidoc

[search] Limit the size of the result window

2015-09-10 15:38:29 -04:00

migrate_3_0.asciidoc

Fix ping timeout settings inconsistencies

2015-09-23 12:58:23 -04:00

migrate_query_refactoring.asciidoc

Query Refactoring: Move MoreLikeThisQueryBuilder validation to constructor

2015-09-23 18:20:46 +02:00