javanna 56b3db6ba3 Merge branch 'master' into feature/query-refactoring ...

Conflicts:
	core/src/main/java/org/elasticsearch/index/query/AndQueryBuilder.java
	core/src/main/java/org/elasticsearch/index/query/AndQueryParser.java
	core/src/main/java/org/elasticsearch/index/query/FQueryFilterParser.java
	core/src/main/java/org/elasticsearch/index/query/FilteredQueryBuilder.java
	core/src/main/java/org/elasticsearch/index/query/FilteredQueryParser.java
	core/src/main/java/org/elasticsearch/index/query/HasChildQueryParser.java
	core/src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java
	core/src/main/java/org/elasticsearch/index/query/LimitQueryBuilder.java
	core/src/main/java/org/elasticsearch/index/query/LimitQueryParser.java
	core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryParser.java
	core/src/main/java/org/elasticsearch/index/query/OrQueryBuilder.java
	core/src/main/java/org/elasticsearch/index/query/OrQueryParser.java
	core/src/main/java/org/elasticsearch/index/query/QueryFilterBuilder.java
	core/src/main/java/org/elasticsearch/index/query/QueryFilterParser.java
	core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
	core/src/main/java/org/elasticsearch/index/query/ScriptQueryParser.java
	core/src/main/java/org/elasticsearch/indices/query/IndicesQueriesRegistry.java
	core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java
	core/src/main/java/org/elasticsearch/search/sort/SortParseElement.java
	core/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchShortCircuitBenchmark.java
	core/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java

2015-09-10 15:52:28 +02:00

..

migrate_2_0

Merge pull request #13383 from rjernst/go_away_transport_paths

2015-09-08 13:28:21 -07:00

index.asciidoc

Remove the scan and count search types.

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

migrate_1_0.asciidoc

Remove delete-by-query core docs

2015-08-01 05:14:46 -04: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

nested sorting: If sorting by nested field then the nested_path should always be specified.

2015-09-10 12:21:12 +02:00

migrate_3_0.asciidoc

Removed pre 2.x parent child implementation

2015-09-09 13:21:40 +02:00

migrate_query_refactoring.asciidoc

Query refactoring: MatchQueryBuilder

2015-09-10 12:14:55 +02:00