Merge branch 'update-aws-sdk' of https://github.com/schonfeld/elasticsearch into schonfeld-update-aws-sdk

This commit is contained in:
David Pilato 2015-09-18 20:00:06 +02:00
commit 8662b52be8
3 changed files with 1 additions and 2 deletions

View File

@ -16,7 +16,6 @@
<properties>
<elasticsearch.plugin.classname>org.elasticsearch.plugin.discovery.ec2.Ec2DiscoveryPlugin</elasticsearch.plugin.classname>
<amazonaws.version>1.10.12</amazonaws.version>
<tests.jvms>1</tests.jvms>
<tests.rest.suite>discovery_ec2</tests.rest.suite>
<tests.rest.load_packaged>false</tests.rest.load_packaged>

View File

@ -26,6 +26,7 @@
<elasticsearch.plugin.jvm>true</elasticsearch.plugin.jvm>
<elasticsearch.plugin.isolated>true</elasticsearch.plugin.isolated>
<elasticsearch.plugin.site>false</elasticsearch.plugin.site>
<amazonaws.version>1.10.19</amazonaws.version>
</properties>
<dependencies>

View File

@ -16,7 +16,6 @@
<properties>
<elasticsearch.plugin.classname>org.elasticsearch.plugin.repository.s3.S3RepositoryPlugin</elasticsearch.plugin.classname>
<amazonaws.version>1.10.12</amazonaws.version>
<tests.jvms>1</tests.jvms>
<tests.rest.suite>repository_s3</tests.rest.suite>
<tests.rest.load_packaged>false</tests.rest.load_packaged>