You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/11/18 16:51:12 UTC
jclouds git commit: JCLOUDS-766: Add AWS Frankfurt region
Repository: jclouds
Updated Branches:
refs/heads/1.7.x 229fdd70c -> 0ff7b0810
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/0ff7b081
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/0ff7b081
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/0ff7b081
Branch: refs/heads/1.7.x
Commit: 0ff7b08108e848f22e110695029f3bfe30b4ceb0
Parents: 229fdd7
Author: Ignasi Barrera <na...@apache.org>
Authored: Wed Oct 29 21:26:29 2014 +0100
Committer: Adrian Cole <ad...@gmail.com>
Committed: Tue Nov 18 07:47:06 2014 -0800
----------------------------------------------------------------------
.../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/0ff7b081/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 8c42acb..55069a4 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
@@ -49,6 +49,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/>
@@ -110,8 +115,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() {
@@ -127,12 +132,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");