OpenSearch/plugins/repository-s3
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
..
licenses Merge branch 'master' into pr/update-aws-sdk 2016-05-27 10:13:35 +02:00
src Merge branch 'pr/update-aws-sdk' 2016-06-17 17:23:12 +02:00
build.gradle Merge branch 'master' into pr/update-aws-sdk 2016-05-27 10:13:35 +02:00