Repository: jclouds Updated Branches: refs/heads/master 93a8ce433 -> 5a1c95525
JCLOUDS-1262: Correct US-OH region Follow on to 04ab255d9f45e9a22ed6711216c5f02664d75a2e. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/5a1c9552 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/5a1c9552 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/5a1c9552 Branch: refs/heads/master Commit: 5a1c95525fe397596c2c3073bd17facf3bfadd35 Parents: 93a8ce4 Author: Andrew Gaul <[email protected]> Authored: Mon Apr 10 13:11:38 2017 -0700 Committer: Andrew Gaul <[email protected]> Committed: Mon Apr 10 13:11:38 2017 -0700 ---------------------------------------------------------------------- apis/sts/src/main/java/org/jclouds/aws/domain/Region.java | 4 ++-- .../main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java | 2 +- .../src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/5a1c9552/apis/sts/src/main/java/org/jclouds/aws/domain/Region.java ---------------------------------------------------------------------- diff --git a/apis/sts/src/main/java/org/jclouds/aws/domain/Region.java b/apis/sts/src/main/java/org/jclouds/aws/domain/Region.java index 3e9bdc7..633e120 100644 --- a/apis/sts/src/main/java/org/jclouds/aws/domain/Region.java +++ b/apis/sts/src/main/java/org/jclouds/aws/domain/Region.java @@ -152,7 +152,7 @@ public class Region { Properties properties = regionProperties(); properties.setProperty(PROPERTY_REGIONS, Joiner.on(',').join(DEFAULT_S3)); // note that due to US_STANDARD the codes include US instead of US-VA - properties.setProperty(PROPERTY_ISO3166_CODES, "US,US_OH,US-CA,US-OR,CA,BR-SP,IE,GB-LND,DE-HE,SG,AU-NSW,IN-MH,JP-13,KR-11,CN-11"); + properties.setProperty(PROPERTY_ISO3166_CODES, "US,US-OH,US-CA,US-OR,CA,BR-SP,IE,GB-LND,DE-HE,SG,AU-NSW,IN-MH,JP-13,KR-11,CN-11"); properties.setProperty(PROPERTY_REGION + "." + US_STANDARD + "." + ISO3166_CODES, "US"); return properties; } @@ -160,7 +160,7 @@ public class Region { public static Properties regionProperties() { Properties properties = new Properties(); properties.setProperty(PROPERTY_REGIONS, Joiner.on(',').join(DEFAULT_REGIONS)); - properties.setProperty(PROPERTY_ISO3166_CODES, "US-VA,US_OH,US-CA,US-OR,CA,BR-SP,IE,GB-LND,DE-HE,SG,AU-NSW,IN-MH,JP-13,KR-11,CN-11"); + properties.setProperty(PROPERTY_ISO3166_CODES, "US-VA,US-OH,US-CA,US-OR,CA,BR-SP,IE,GB-LND,DE-HE,SG,AU-NSW,IN-MH,JP-13,KR-11,CN-11"); properties.setProperty(PROPERTY_REGION + "." + US_EAST_1 + "." + ISO3166_CODES, "US-VA"); properties.setProperty(PROPERTY_REGION + "." + US_EAST_2 + "." + ISO3166_CODES, "US-OH"); properties.setProperty(PROPERTY_REGION + "." + US_WEST_1 + "." + ISO3166_CODES, "US-CA"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/5a1c9552/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java index 5cc7529..12b07a5 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java @@ -86,7 +86,7 @@ public class AWSEC2ProviderMetadata extends BaseProviderMetadata { .console(URI.create("https://console.aws.amazon.com/ec2/home";)) .defaultProperties(AWSEC2ProviderMetadata.defaultProperties()) .linkedServices("aws-ec2", "aws-elb", "aws-cloudwatch", "aws-s3", "aws-simpledb") - .iso3166Codes("US-VA", "US_OH", "US-CA", "US-OR", "CA", "BR-SP", "IE", "GB-LND", "DE-HE", "SG", "AU-NSW", "IN-MH", "JP-13", "KR-11", "CN-11"); + .iso3166Codes("US-VA", "US-OH", "US-CA", "US-OR", "CA", "BR-SP", "IE", "GB-LND", "DE-HE", "SG", "AU-NSW", "IN-MH", "JP-13", "KR-11", "CN-11"); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/5a1c9552/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java index ae0b665..216900d 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java @@ -106,7 +106,7 @@ public class AWSS3ProviderMetadata extends BaseProviderMetadata { .homepage(URI.create("http://aws.amazon.com/s3";)) .console(URI.create("https://console.aws.amazon.com/s3/home";)) .linkedServices("aws-ec2", "aws-elb", "aws-cloudwatch", "aws-s3", "aws-simpledb") - .iso3166Codes("US", "US_OH", "US-CA", "US-OR", "CA", "BR-SP", "IE", "GB-LND", "DE-HE", "SG", "AU-NSW", "IN-MH", "JP-13", "KR-11", "CN-11") + .iso3166Codes("US", "US-OH", "US-CA", "US-OR", "CA", "BR-SP", "IE", "GB-LND", "DE-HE", "SG", "AU-NSW", "IN-MH", "JP-13", "KR-11", "CN-11") .defaultProperties(AWSS3ProviderMetadata.defaultProperties()); }
