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

# Conflicts:
#	core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java
#	core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregator.java
#	core/src/main/java/org/elasticsearch/search/SearchModule.java

2016-01-25 10:42:20 +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-01-25 10:42:20 +00:00

build.gradle

Build: Add fixture capabilities to integ tests

2015-12-19 15:46:21 -08:00