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 Azure Storage client to 4.0.0	2016-02-29 15:00:34 +01:00
src	Merge branch 'master' into pr/16598-register-filter-settings	2016-03-02 09:43:53 +01:00
LICENSE.txt	[cloud-azure] Split azure plugin in 3 plugins	2015-09-21 17:55:23 +02:00
build.gradle	Upgrade Azure Storage client to 4.0.0	2016-02-29 15:00:34 +01:00