OpenSearch

mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-01 16:39:11 +00:00

History

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

bucket

Docs: Updated the experimental annotations in the docs as follows:

2015-04-26 18:49:15 +02:00

metrics

Docs: adding missing single quote on PUT index request

2015-04-29 14:45:25 +02:00

reducer

[DOCS] review comment fixes

2015-04-27 14:40:04 -04:00

bucket.asciidoc

Aggregations: Add children bucket aggregator that is able to map buckets between parent types and child types using the already builtin parent/child support.