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

Conflicts:
	core/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java
	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/HasParentQueryParser.java
	core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java
	core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java
	core/src/main/java/org/elasticsearch/index/search/child/ChildrenQuery.java
	core/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
	core/src/test/java/org/elasticsearch/index/search/child/AbstractChildTestCase.java
	core/src/test/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQueryTests.java
	core/src/test/java/org/elasticsearch/index/search/child/ChildrenQueryTests.java
	core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcIT.java
	core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchIT.java
	core/src/test/resources/org/elasticsearch/index/query/simple-query-string.json

2015-09-09 17:08:22 +02:00

..

aggregations

Docs: Improved the date histogram docs for time_zone and offset

2015-09-07 19:54:00 +02:00

analysis

Upgrade to lucene 5.4-snapshot r1701068

2015-09-03 15:13:33 -04:00

cat

Add script compilation stats

2015-08-07 18:25:55 -04:00

cluster

update list of available os stats

2015-08-31 17:03:45 +02:00

docs

Docs: Added deprecation notice for _timestamp and _ttl

2015-09-07 21:16:19 +02:00

images

Aggregations: add serial differencing pipeline aggregation

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

index-modules

Allocation: add support for filtering by transport IP address

2015-09-09 15:15:53 +02:00

indices

Merge pull request #13018 from dylan8902/patch-1

2015-08-24 14:59:43 +02:00

mapping

add points_only option to GeoShapeFieldMapper for optimizing indexing performance on geo_shape indexes designed to store only points. Includes updated documentation and exception handling for ensuring index integrity on points only data.

2015-09-08 16:17:50 -05:00

migration

Merge branch 'master' into feature/query-refactoring

2015-09-09 17:08:22 +02:00

modules

[doc] fix cross link between core and plugins doc

2015-09-03 12:11:58 +02:00

query-dsl

Split HasParentQueryParser into toQuery and formXContent

2015-09-09 12:06:44 +02:00

search

docs: inner hits is no longer experimental

2015-09-07 16:58:46 +02:00

setup

Docs: Documented path.script

2015-08-15 16:20:06 +02:00

testing

Plugins: Removed plugin.types

2015-08-22 01:37:43 -07:00

aggregations.asciidoc

Scripting: Unify script and template requests across codebase

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

analysis.asciidoc

Add more anchor links to documentation

2013-09-30 13:13:16 -06:00

api-conventions.asciidoc

Docs: Date-math should be on common options

2015-08-06 17:49:30 +02:00

cat.asciidoc

Add _cat/nodeattrs API

2015-07-29 16:11:18 -04: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: Fixed typo in getting started

2015-08-29 13:15:18 +02:00

glossary.asciidoc

Networking: Move multicast discovery to a plugin

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

index-modules.asciidoc

Docs: index.codec is static, not dynamic

2015-09-01 11:49:42 +02:00

index.asciidoc

Docs: Prepare plugin and integration docs for 2.0

2015-08-15 18:02:43 +02:00

indices.asciidoc

Docs: Incorrect file name for shard stores

2015-07-18 12:08:46 +02:00

mapping.asciidoc

Docs: Made multi-fields more prominent

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

modules.asciidoc

Docs: Refactored modules and index modules sections

2015-06-22 23:49:45 +02:00

query-dsl.asciidoc

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

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

redirects.asciidoc

Rename caches.

2015-06-29 10:15:27 +02:00

search.asciidoc

[Docs] Fix minor spelling errors

2015-05-25 19:56:43 +02:00

setup.asciidoc

Docs: Mention in migration doc that order to dynamic arguments is important

2015-08-10 11:33:25 +02:00

testing.asciidoc

[DOCS] Test framework documentation

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