Colin Goodheart-Smithe a241983c9d Merge branch 'master' into feature/aggs-refactoring ... # Conflicts: # core/src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryIT.java # core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java # core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java # core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java # core/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java # core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java # core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java # modules/lang-groovy/src/test/java/org/elasticsearch/messy/tests/BucketSelectorTests.java # modules/lang-groovy/src/test/java/org/elasticsearch/messy/tests/TDigestPercentileRanksTests.java		2016-02-01 13:38:33 +00:00
..
fixtures	in the plugin: guard against HADOOP_HOME in environment on any platform.	2015-12-21 02:21:53 -05:00
framework	Merge branch 'master' into feature/aggs-refactoring	2016-02-01 13:38:33 +00:00
build.gradle	Build: Add fixture capabilities to integ tests	2015-12-19 15:46:21 -08:00