Author: amitj
Date: Fri Jun 29 11:30:13 2018
New Revision: 1834669
URL: http://svn.apache.org/viewvc?rev=1834669&view=rev
Log:
OAK-7536: Update aws java sdk version to 1.11.330
- Merge r1833308 from trunk (Added a missing file)
Modified:
jackrabbit/oak/branches/1.2/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/Utils.java
Modified:
jackrabbit/oak/branches/1.2/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/Utils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/Utils.java?rev=1834669&r1=1834668&r2=1834669&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/Utils.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/Utils.java
Fri Jun 29 11:30:13 2018
@@ -113,10 +113,8 @@ public final class Utils {
}
if (DEFAULT_AWS_BUCKET_REGION.equals(region)) {
endpoint = S3 + DOT + AWSDOTCOM;
- } else if (Region.EU_Ireland.toString().equals(region)) {
- endpoint = "s3-eu-west-1" + DOT + AWSDOTCOM;
} else {
- endpoint = S3 + DASH + region + DOT + AWSDOTCOM;
+ endpoint = S3 + DOT + region + DOT + AWSDOTCOM;
}
}
/*
