Colin Goodheart-Smithe 2c33f78192 Merge branch 'master' into feature/aggs-refactoring ...

# Conflicts:
#	core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenParser.java
#	core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParser.java
#	test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java

2016-01-06 09:35:53 +00:00

..

aggregations

Merge branch 'master' into feature/aggs-refactoring

2016-01-06 09:35:53 +00:00

analysis

[doc] Fix cross link with ICU plugin

2015-12-30 12:07:33 +01:00

cat

Update health.asciidoc

2015-11-17 14:46:18 -07:00

cluster

Merge branch 'master' into settings_prototype

2015-12-15 16:33:01 +01:00

docs

Separates routing and parent in all documentrequest in order to be able to distinguish an explicit routing value from a parent routing.

2015-12-21 09:44:57 +01:00

images

Aggregations: add serial differencing pipeline aggregation

2015-07-10 18:22:01 -04:00

index-modules

Merge pull request #15446 from jimferenczi/classic_similarity

2015-12-30 08:42:20 -08:00

indices

Merge pull request #15371 from jimferenczi/alias_routing

2015-12-21 09:58:45 +01:00

mapping

Renames "default" similarity into "classic".

2015-12-21 16:22:53 +01:00

migration

Merge pull request #15446 from jimferenczi/classic_similarity

2015-12-30 08:42:20 -08:00

modules

Remove recovery threadpools and throttle outgoing recoveries on the master

2015-12-22 14:59:43 +01:00

query-dsl

field name is changed

2015-12-31 15:16:56 +09:00

search

Merge pull request #15740 from PowerToFly/master

2016-01-05 14:29:44 +01:00

setup

Update rolling_upgrade.asciidoc

2015-12-05 13:30:47 +01:00

tasks

Task Management: Add framework for registering and communicating with tasks

2016-01-05 12:24:43 -05:00

testing

Docs: Fix nodeSettings example for integ tests to use correct Settings.Builder reference

2015-12-17 23:17:17 -08:00

aggregations.asciidoc

Scripting: Unify script and template requests across codebase

2015-05-29 16:52:04 +01:00

analysis.asciidoc

Remove ICU Plugin in reference guide

2015-12-29 11:23:28 +01:00

api-conventions.asciidoc

Added "size units" to API conventions docs

2015-12-10 12:01:18 +01:00

cat.asciidoc

Add cat API for repositories and snapshots

2015-10-26 18:37:10 +01:00

cluster.asciidoc

Remove _shutdown API

2015-04-27 17:19:36 +02:00

docs.asciidoc

Remove delete-by-query core docs

2015-08-01 05:14:46 -04:00

getting-started.asciidoc

[docs] Fix download link

2015-11-05 14:18:49 -05:00

glossary.asciidoc

Networking: Move multicast discovery to a plugin

2015-08-20 16:43:25 -07:00

index-modules.asciidoc

Allocate primary shards based on allocation ids

2015-12-17 15:55:50 +01:00

index.asciidoc

Improvements to network docs

2015-12-10 12:01:18 +01:00

indices.asciidoc

Remove /_optimize REST API endpoint

2015-10-27 10:17:16 -06:00

mapping.asciidoc

Docs: Made multi-fields more prominent

2015-08-06 20:09:42 +02:00

modules.asciidoc

Merge pull request #14612 from arinto/patch-2

2015-11-09 14:00:56 +01:00

query-dsl.asciidoc

Fixed broken xrefs to query-dsl-not-query, which has been removed.

2015-10-20 13:01:37 -07:00

redirects.asciidoc

Removes all the reference of the query in the docs

2015-12-11 20:07:57 +01:00

release-notes.asciidoc

Updated the release-notes script to produce AsciiDoc and added placeholders

2015-11-20 20:05:53 +01:00

search.asciidoc

Add ability to profile query and collectors

2015-12-17 15:29:00 -05:00

setup.asciidoc

Update setup.asciidoc

2015-10-09 12:27:43 +02:00

testing.asciidoc

[DOCS] Test framework documentation

2013-12-02 18:01:45 +01:00