javanna 73f7df510e Merge branch 'master' into feature/query-refactoring ...

Conflicts:
	core/src/main/java/org/elasticsearch/index/query/HasChildQueryBuilder.java
	core/src/main/java/org/elasticsearch/index/query/HasChildQueryParser.java
	core/src/main/java/org/elasticsearch/index/query/HasParentQueryBuilder.java
	core/src/main/java/org/elasticsearch/index/query/HasParentQueryParser.java
	core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java
	core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryParser.java
	core/src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorParser.java
	core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java
	core/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java
	core/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchShortCircuitBenchmark.java
	core/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
	core/src/test/java/org/elasticsearch/percolator/PercolatorIT.java
	core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchIT.java
	docs/reference/query-dsl/has-parent-query.asciidoc

2015-09-11 14:15:12 +02:00

..

bool-query.asciidoc

Update bool-query.asciidoc

2015-06-10 21:46:23 +02:00

boosting-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

common-terms-query.asciidoc

Fixed typos in examples on common-terms-query.asciidoc. JSON was invalid before

2015-07-08 17:47:04 +02:00

compound-queries.asciidoc

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

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

constant-score-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

dis-max-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

exists-query.asciidoc

Docs: Mapping docs completely rewritten for 2.0

2015-08-06 17:24:51 +02:00

full-text-queries.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

function-score-query.asciidoc

Docs: Mapping docs completely rewritten for 2.0

2015-08-06 17:24:51 +02:00

fuzzy-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

geo-bounding-box-query.asciidoc

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

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

geo-distance-query.asciidoc

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

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

geo-distance-range-query.asciidoc

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

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

geo-polygon-query.asciidoc

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

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

geo-queries.asciidoc

Docs: Mapping docs completely rewritten for 2.0

2015-08-06 17:24:51 +02:00

geo-shape-query.asciidoc

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

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

geohash-cell-query.asciidoc

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

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

has-child-query.asciidoc

parent/child: several cleanups

2015-09-10 17:15:41 +02:00

has-parent-query.asciidoc

Merge branch 'master' into feature/query-refactoring

2015-09-11 14:15:12 +02:00

ids-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

indices-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

joining-queries.asciidoc

Docs: Mapping docs completely rewritten for 2.0

2015-08-06 17:24:51 +02:00

match-all-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

match-query.asciidoc

Merge pull request #12264 from peschlowp/patch-6

2015-07-15 13:22:23 +02:00

minimum-should-match.asciidoc

Query DSL: Remove filter parsers.

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

missing-query.asciidoc

Docs: Mapping docs completely rewritten for 2.0

2015-08-06 17:24:51 +02:00

mlt-query.asciidoc

Docs: Updated annotations for 2.0.0-beta1

2015-08-14 10:51:09 +02:00

multi-match-query.asciidoc

multi_match query applies boosts too many times.

2015-08-06 19:07:12 +02:00

multi-term-rewrite.asciidoc

Expose Lucene's new TopTermsBlendedFreqScoringRewrite.

2015-07-08 16:01:47 +02:00

nested-query.asciidoc

Docs: Mapping docs completely rewritten for 2.0

2015-08-06 17:24:51 +02:00

not-query.asciidoc

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

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

prefix-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

query_filter_context.asciidoc

Docs: Use "js" instead of "json" and "sh" instead of "shell" for source highlighting

2015-07-14 18:14:09 +02:00

query-string-query.asciidoc

Docs: Update Joda URLs in documentation.

2015-06-26 10:23:02 +02:00

query-string-syntax.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

range-query.asciidoc

Docs: Mapping docs completely rewritten for 2.0

2015-08-06 17:24:51 +02:00

regexp-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

regexp-syntax.asciidoc

Docs: Fixed heading level for in query DSL docs

2015-06-04 13:16:32 +02:00

script-query.asciidoc

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

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

simple-query-string-query.asciidoc

Docs: add description of the analyze_wildcard parameter to the simple query string query docs

2015-06-22 18:26:31 -04:00

span-containing-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

span-first-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

span-multi-term-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

span-near-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

span-not-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

span-or-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

span-queries.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

span-term-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

span-within-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

special-queries.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

template-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

term-level-queries.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

term-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

terms-query.asciidoc

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

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

type-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00

wildcard-query.asciidoc

Docs: Reorganised the Query DSL docs into families and explaing query vs filter context

2015-06-04 01:59:37 +02:00