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

..

licenses

Improve thirdPartyAudit check, round 3

2015-12-28 22:38:55 -05:00

src

Merge branch 'master' into feature/aggs-refactoring

2016-01-25 10:42:20 +00:00

build.gradle

Remove Xlint from lang-groovy and discovery-azure

2016-01-18 18:24:44 -05:00