You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by am...@apache.org on 2018/06/29 11:13:35 UTC
svn commit: r1834668 -
/jackrabbit/branches/2.12/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java
Author: amitj
Date: Fri Jun 29 11:13:35 2018
New Revision: 1834668
URL: http://svn.apache.org/viewvc?rev=1834668&view=rev
Log:
OAK-7536: Update aws java sdk version to 1.11.330
- Merge r1833308 from trunk
Modified:
jackrabbit/branches/2.12/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java
Modified: jackrabbit/branches/2.12/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.12/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java?rev=1834668&r1=1834667&r2=1834668&view=diff
==============================================================================
--- jackrabbit/branches/2.12/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java (original)
+++ jackrabbit/branches/2.12/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java Fri Jun 29 11:13:35 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;
}
}
/*