Repository: jclouds Updated Branches: refs/heads/1.8.x 5511bad76 -> a34b98418
JCLOUDS-766: Add AWS Frankfurt region Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/a34b9841 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/a34b9841 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/a34b9841 Branch: refs/heads/1.8.x Commit: a34b984186b450b490d2c3753b690e4d90de923f Parents: 5511bad Author: Ignasi Barrera <[email protected]> Authored: Wed Oct 29 21:26:29 2014 +0100 Committer: Ignasi Barrera <[email protected]> Committed: Wed Oct 29 22:13:35 2014 +0100 ---------------------------------------------------------------------- .../src/main/java/org/jclouds/aws/domain/Region.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/a34b9841/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 eedc40f..1a3a9c7 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 @@ -47,6 +47,11 @@ public class Region { public static final String EU_WEST_1 = "eu-west-1"; /** + * EU (Frankfurt) + */ + public static final String EU_CENTRAL_1 = "eu-central-1"; + + /** * * US Standard * <p/> @@ -108,8 +113,8 @@ public class Region { public static final Set<String> DEFAULT_S3 = ImmutableSet.of(US_STANDARD, US_WEST_1, US_WEST_2, EU_WEST_1, SA_EAST_1, AP_SOUTHEAST_1, AP_SOUTHEAST_2, AP_NORTHEAST_1); - public static final Set<String> DEFAULT_REGIONS = ImmutableSet.of(US_EAST_1, US_WEST_1, US_WEST_2, SA_EAST_1, EU_WEST_1, - AP_SOUTHEAST_1, AP_SOUTHEAST_2, AP_NORTHEAST_1); + public static final Set<String> DEFAULT_REGIONS = ImmutableSet.of(US_EAST_1, US_WEST_1, US_WEST_2, SA_EAST_1, + EU_WEST_1, EU_CENTRAL_1, AP_SOUTHEAST_1, AP_SOUTHEAST_2, AP_NORTHEAST_1); public static Properties regionPropertiesS3() { @@ -125,12 +130,13 @@ 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-CA,US-OR,BR-SP,IE,SG,AU-NSW,JP-13"); + properties.setProperty(PROPERTY_ISO3166_CODES, "US-VA,US-CA,US-OR,BR-SP,IE,DE-HE,SG,AU-NSW,JP-13"); properties.setProperty(PROPERTY_REGION + "." + US_EAST_1 + "." + ISO3166_CODES, "US-VA"); properties.setProperty(PROPERTY_REGION + "." + US_WEST_1 + "." + ISO3166_CODES, "US-CA"); properties.setProperty(PROPERTY_REGION + "." + US_WEST_2 + "." + ISO3166_CODES, "US-OR"); properties.setProperty(PROPERTY_REGION + "." + SA_EAST_1 + "." + ISO3166_CODES, "BR-SP"); properties.setProperty(PROPERTY_REGION + "." + EU_WEST_1 + "." + ISO3166_CODES, "IE"); + properties.setProperty(PROPERTY_REGION + "." + EU_CENTRAL_1 + "." + ISO3166_CODES, "DE-HE"); properties.setProperty(PROPERTY_REGION + "." + AP_SOUTHEAST_1 + "." + ISO3166_CODES, "SG"); properties.setProperty(PROPERTY_REGION + "." + AP_SOUTHEAST_2 + "." + ISO3166_CODES, "AU-NSW"); properties.setProperty(PROPERTY_REGION + "." + AP_NORTHEAST_1 + "." + ISO3166_CODES, "JP-13");
