Merge pull request #24 from wikka/sa-east-1

Sa east 1
This commit is contained in:
Shay Banon 2013-04-04 01:03:23 -07:00
commit a75d4246e3
2 changed files with 6 additions and 0 deletions

View File

@ -120,6 +120,8 @@ public class AwsEc2Service extends AbstractLifecycleComponent<AwsEc2Service> {
endpoint = "ec2.ap-northeast-1.amazonaws.com";
} else if (region.equals("eu-west") || region.equals("eu-west-1")) {
endpoint = "ec2.eu-west-1.amazonaws.com";
} else if (region.equals("sa-east") || region.equals("sa-east-1")) {
endpoint = "ec2.sa-east-1.amazonaws.com";
} else {
throw new ElasticSearchIllegalArgumentException("No automatic endpoint could be derived from region [" + region + "]");
}

View File

@ -121,6 +121,10 @@ public class AwsS3Service extends AbstractLifecycleComponent<AwsS3Service> {
endpoint = "s3-eu-west-1.amazonaws.com";
} else if ("eu-west-1".equals(region)) {
endpoint = "s3-eu-west-1.amazonaws.com";
} else if ("sa-east".equals(region)) {
endpoint = "s3-sa-east-1.amazonaws.com";
} else if ("sa-east-1".equals(region)) {
endpoint = "s3-sa-east-1.amazonaws.com";
} else {
throw new ElasticSearchIllegalArgumentException("No automatic endpoint could be derived from region [" + region + "]");
}