David Pilato bf7a6f5509 Merge branch 'pr/update-aws-sdk'
# Conflicts:
#	plugins/repository-s3/src/main/java/org/elasticsearch/plugin/repository/s3/S3RepositoryPlugin.java
2016-06-17 17:23:12 +02:00
..
2016-06-14 14:32:29 -04:00
2016-05-24 13:28:20 +02:00
2016-06-14 14:32:29 -04:00
2016-06-14 14:32:29 -04:00
2016-06-14 14:32:29 -04:00
2016-06-14 14:32:29 -04:00