Colin Goodheart-Smithe 641aaab896 Merge branch 'master' into feature/aggs-refactoring ...

# Conflicts:
#	core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java
#	core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java
#	core/src/main/java/org/elasticsearch/search/SearchModule.java

2016-01-26 16:07:17 +00:00

..

aggregations

Merge branch 'master' into feature/aggs-refactoring

2016-01-26 13:17:53 +00:00

analysis

Merge pull request #15794 from damienalexandre/french-doc

2016-01-06 18:39:26 +01:00

cat

Docs explanation for unassigned shard reason codes.

2016-01-12 13:26:50 +01:00

cluster

Update stats.asciidoc

2016-01-26 13:48:46 +01:00

docs

Added back deprecation notices for _ttl and _timestamp

2016-01-26 11:56:36 +01:00

images

Aggregations: add serial differencing pipeline aggregation

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

index-modules

Update lucene to r1725675

2016-01-20 03:32:51 -05:00

indices

Revert "[DOCS] Clarify Shadow replica setting"

2016-01-15 14:28:44 -05:00

ingest

docs: Remove the fact that ingest was a plugin from the docs.

2016-01-26 15:49:47 +01:00

mapping

Added back deprecation notices for _ttl and _timestamp

2016-01-26 11:56:36 +01:00

migration

Merge pull request #16014 from cbuescher/refactor/rescore-fromXContent

2016-01-26 15:42:35 +01:00

modules

Merge pull request #15984 from pdudits/patch-1

2016-01-14 14:17:31 +01:00

query-dsl

Update function-score-query.asciidoc

2016-01-22 13:02:04 +01:00

search

percolator: The percolate api shouldn't add field mappings for unmapped fields inside the document being percolated to the mapping.

2016-01-26 10:26:46 +01:00

setup

Plugins: Remove site plugins

2016-01-16 22:45:37 -08: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 warmers and the warmer API.

2016-01-07 09:57:07 +01: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

Remove warmers and the warmer API.

2016-01-07 09:57:07 +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 documentation for global search timeout

2016-01-07 10:42:18 -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