Colin Goodheart-Smithe 3b35754f59 Merge branch 'master' into feature/aggs-refactoring ... # Conflicts: # core/src/test/java/org/elasticsearch/percolator/PercolateDocumentParserTests.java		2016-01-26 13:17:53 +00:00
..
bucket	Merge branch 'master' into feature/aggs-refactoring	2016-01-26 13:17:53 +00:00
metrics	Adds geo_centroid metric aggregator	2015-10-14 16:19:09 -05:00
pipeline	colon is added	2015-11-05 11:32:20 +09:00
bucket.asciidoc	Aggregations Refactor: Refactor Sampler Aggregation	2015-12-21 09:35:46 +00:00
metrics.asciidoc	Adds geo_centroid metric aggregator	2015-10-14 16:19:09 -05:00
misc.asciidoc	add double quotation	2016-01-04 11:55:24 +09:00
pipeline.asciidoc	Updated docs for 3.0.0-beta	2015-10-07 13:27:46 +02:00