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
..
analysis	Docs: Fixed pattern-capture token filter example	2015-04-25 19:27:55 +02:00
cat	Update indices.asciidoc	2015-04-04 16:50:04 +02:00
cluster	Remove `_shutdown` API	2015-04-27 17:19:36 +02:00
docs	Term Vectors: terms filtering	2015-04-14 19:11:09 +02:00
images	fixing typo in expDecayFunction and adding offset to all dacay functions	2015-03-05 12:28:08 +01:00
index-modules	Docs: Updated the experimental annotations in the docs as follows:	2015-04-26 18:49:15 +02:00
indices	Docs: Updated the experimental annotations in the docs as follows:	2015-04-26 18:49:15 +02:00
mapping	Docs: Add documentation for the `doc_values` setting on the `boolean` field type.	2015-04-29 15:59:24 +02:00
migration	Add multi data.path to migration guide	2015-04-29 11:51:37 +02:00
modules	Docs: Update cluster.asciidoc	2015-04-28 11:48:08 +02:00
query-dsl	Add default to field_value_factor	2015-04-28 11:06:24 -04:00
search	Merge branch 'master' into feature/aggs_2_0	2015-04-29 15:49:41 +01:00
setup	Add multi data.path to migration guide	2015-04-29 11:51:37 +02:00
testing	[DOCS] added instructions on how to write parameterized tests	2015-03-19 12:43:51 +01:00
analysis.asciidoc	Add more anchor links to documentation	2013-09-30 13:13:16 -06:00
api-conventions.asciidoc	Docs: fix build.	2015-04-10 17:38:36 +02:00
cat.asciidoc	[TEST] Add missing docs and tests for '_cat/segments'	2015-01-09 12:29:11 +01:00
cluster.asciidoc	Remove `_shutdown` API	2015-04-27 17:19:36 +02:00
docs.asciidoc	Bulk UDP: Removal.	2014-09-11 09:52:09 +02:00
getting-started.asciidoc	[DOCS] added note about dynamic scriptings and updated links in getting started page	2015-03-19 15:22:39 +01:00
glossary.asciidoc	Migrated documentation into the main repo	2013-08-29 01:24:34 +02:00
index-modules.asciidoc	Docs: Updated the experimental annotations in the docs as follows:	2015-04-26 18:49:15 +02:00
index.asciidoc	Docs: Updated current version	2015-04-27 13:45:35 +02:00
indices.asciidoc	Mappings: Remove delete mapping API	2015-03-24 09:46:02 -07:00
mapping.asciidoc	Facets: Removal from master.	2014-08-21 10:34:39 +02:00
modules.asciidoc	Remove references to the thrift and memcached transport plugins	2015-03-19 20:49:58 +01:00
query-dsl.asciidoc	Facets: Removal from master.	2014-08-21 10:34:39 +02:00
search.asciidoc	Added field stats api	2015-04-23 08:52:34 +02:00
setup.asciidoc	Docs: Elasticsearch will refuse to start with a known bad JVM	2015-04-04 20:21:37 +02:00
testing.asciidoc	[DOCS] Test framework documentation	2013-12-02 18:01:45 +01:00