Colin Goodheart-Smithe 57a8885964 Merge branch 'master' into feature/aggs_2_0 ... # Conflicts: # src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java # src/main/java/org/elasticsearch/search/aggregations/AggregationModule.java # src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java # src/main/java/org/elasticsearch/search/aggregations/AggregatorParsers.java # src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java # src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java # src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java # src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTest.java		2015-04-29 15:49:41 +01:00
..
aggregations	Merge branch 'master' into feature/aggs_2_0	2015-04-29 15:49:41 +01:00
request	Docs: The name of scroll ID attribute in the response is "_scroll_id" rather than "scroll_id"	2015-04-25 19:32:32 +02:00
suggesters	Docs: Fix missing comma in context suggester docs	2015-04-23 14:04:46 +02:00
aggregations.asciidoc	Merge branch 'master' into feature/aggs_2_0	2015-04-29 15:49:41 +01:00
count.asciidoc	Docs: Updated the experimental annotations in the docs as follows:	2015-04-26 18:49:15 +02:00
exists.asciidoc	Search Exists API: Checks if any matching documents exist for a given query	2014-07-31 15:42:30 -04:00
explain.asciidoc	Revert "[QUERY] Remove lowercase_expanded_terms and locale options"	2015-03-13 13:51:44 -06:00
facets.asciidoc	Facets: Removal from master.	2014-08-21 10:34:39 +02:00
field-stats.asciidoc	Docs: Tidied docs for field-stats	2015-04-26 15:52:02 +02:00
more-like-this.asciidoc	Added the ability to include the queried document for More Like This API.	2014-05-09 12:59:39 +02:00
multi-search.asciidoc	Search: Remove the `count` search type.	2015-03-31 11:31:49 +02:00
percolate.asciidoc	[DOCS] Fix multi percolate response sample in percolate.asciidoc	2015-03-30 11:32:41 +02:00
request-body.asciidoc	Docs: Updated the experimental annotations in the docs as follows:	2015-04-26 18:49:15 +02:00
search-shards.asciidoc	Docs: Fixed path to search-shards	2014-07-26 15:05:53 +02:00
search-template.asciidoc	Docs: Updated version annotations in master	2015-04-09 14:50:11 +02:00
search.asciidoc	[DOCS] Corrected syntax error in search curl cmd	2014-11-12 17:21:19 +01:00
suggesters.asciidoc	Search: Remove the `count` search type.	2015-03-31 11:31:49 +02:00
uri-request.asciidoc	Docs: Updated the experimental annotations in the docs as follows:	2015-04-26 18:49:15 +02:00
validate.asciidoc	Validate API: support for verbose explanation of succesfully validated queries	2015-04-13 19:17:58 +02:00