David Pilato 5fbf1b95dc Merge branch 'master' into pr/16598-register-filter-settings ...

# Conflicts:
#	core/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java
#	core/src/main/java/org/elasticsearch/discovery/DiscoveryService.java
#	core/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java
#	core/src/main/java/org/elasticsearch/http/HttpTransportSettings.java
#	plugins/repository-azure/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageService.java

2016-03-02 09:43:53 +01:00

..

licenses

Upgrade to aws 1.10.33

2015-11-10 22:51:33 -05:00

src

Merge branch 'master' into pr/16598-register-filter-settings

2016-03-02 09:43:53 +01:00

build.gradle

Remove -Xlint:-deprecation from plugins

2016-01-07 20:44:46 -05:00