javanna 52be313c69 Merge branch 'master' into feature/query-refactoring ... Conflicts: core/src/main/java/org/elasticsearch/index/query/BoolQueryParser.java core/src/main/java/org/elasticsearch/index/query/IdsQueryParser.java core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringParser.java core/src/main/java/org/elasticsearch/index/query/TemplateQueryParser.java core/src/main/java/org/elasticsearch/index/query/TermsQueryParser.java core/src/main/java/org/elasticsearch/index/query/functionscore/fieldvaluefactor/FieldValueFactorFunctionParser.java core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java		2015-09-02 16:00:35 +02:00
..
migrate_2_0	Update settings.asciidoc	2015-08-28 18:31:54 +02:00
index.asciidoc	Deprecate the `scan` search type.	2015-08-20 12:47:23 +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	Remove the experimental indices.fielddata.cache.expire	2015-09-01 00:40:04 -07:00
migrate_query_refactoring.asciidoc	removes TermsLookup changes as it was used internally	2015-08-26 14:07:55 +02:00