You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/05/07 11:39:29 UTC
git commit: Fixing jclouds 'since' version according to a community
suggestion
Repository: incubator-stratos
Updated Branches:
refs/heads/master f70b69673 -> ff6da3ab3
Fixing jclouds 'since' version according to a community suggestion
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ff6da3ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ff6da3ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ff6da3ab
Branch: refs/heads/master
Commit: ff6da3ab3af613fa338af08d7501a67b1242c1e8
Parents: f70b696
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Wed May 7 15:08:57 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Wed May 7 15:08:57 2014 +0530
----------------------------------------------------------------------
.../jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java | 12 ++++++------
.../org/jclouds/aws/ec2/domain/AWSRunningInstance.java | 2 +-
.../org/jclouds/aws/ec2/domain/LaunchSpecification.java | 4 ++--
.../jclouds/aws/ec2/options/AWSRunInstancesOptions.java | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ff6da3ab/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java b/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java
index 0fd958c..56ad2df 100644
--- a/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java
+++ b/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java
@@ -197,7 +197,7 @@ public class AWSEC2TemplateOptions extends EC2TemplateOptions implements Cloneab
/**
* @see org.jclouds.aws.ec2.options.AWSRunInstancesOptions#withIAMInstanceProfileArn(String)
*/
- @SinceApiVersion("2014-02-01")
+ @SinceApiVersion("2012-06-01")
public AWSEC2TemplateOptions iamInstanceProfileArn(String arn) {
this.iamInstanceProfileArn = checkNotNull(emptyToNull(arn), "arn must be defined");
return this;
@@ -206,7 +206,7 @@ public class AWSEC2TemplateOptions extends EC2TemplateOptions implements Cloneab
/**
* @see org.jclouds.aws.ec2.options.AWSRunInstancesOptions#withIAMInstanceProfileName(String)
*/
- @SinceApiVersion("2014-02-01")
+ @SinceApiVersion("2012-06-01")
public AWSEC2TemplateOptions iamInstanceProfileName(String name) {
this.iamInstanceProfileName = checkNotNull(emptyToNull(name), "name must be defined");
return this;
@@ -453,7 +453,7 @@ public class AWSEC2TemplateOptions extends EC2TemplateOptions implements Cloneab
/**
* @see AWSEC2TemplateOptions#iamInstanceProfileArn
*/
- @SinceApiVersion("2014-02-01")
+ @SinceApiVersion("2012-06-01")
public static AWSEC2TemplateOptions iamInstanceProfileArn(String arn) {
AWSEC2TemplateOptions options = new AWSEC2TemplateOptions();
return options.iamInstanceProfileArn(arn);
@@ -462,7 +462,7 @@ public class AWSEC2TemplateOptions extends EC2TemplateOptions implements Cloneab
/**
* @see AWSEC2TemplateOptions#iamInstanceProfileName
*/
- @SinceApiVersion("2014-02-01")
+ @SinceApiVersion("2012-06-01")
public static AWSEC2TemplateOptions iamInstanceProfileName(String name) {
AWSEC2TemplateOptions options = new AWSEC2TemplateOptions();
return options.iamInstanceProfileName(name);
@@ -807,7 +807,7 @@ public class AWSEC2TemplateOptions extends EC2TemplateOptions implements Cloneab
*
* @see org.jclouds.aws.ec2.options.AWSRunInstancesOptions#withIAMInstanceProfileArn(String)
*/
- @SinceApiVersion("2014-02-01")
+ @SinceApiVersion("2012-06-01")
public String getIAMInstanceProfileArn() {
return iamInstanceProfileArn;
}
@@ -817,7 +817,7 @@ public class AWSEC2TemplateOptions extends EC2TemplateOptions implements Cloneab
*
* @see org.jclouds.aws.ec2.options.AWSRunInstancesOptions#withIAMInstanceProfileName(String)
*/
- @SinceApiVersion("2014-02-01")
+ @SinceApiVersion("2012-06-01")
public String getIAMInstanceProfileName() {
return iamInstanceProfileName;
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ff6da3ab/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java b/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java
index d59aad4..3da4bcd 100644
--- a/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java
+++ b/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java
@@ -284,7 +284,7 @@ public class AWSRunningInstance extends RunningInstance {
/**
* The IAM Instance Profile (IIP) associated with the instance.
*/
- @SinceApiVersion("2014-02-01")
+ @SinceApiVersion("2012-06-01")
public Optional<IAMInstanceProfile> getIAMInstanceProfile() {
return iamInstanceProfile;
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ff6da3ab/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java b/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java
index 8fbd033..a9192f9 100644
--- a/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java
+++ b/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java
@@ -386,7 +386,7 @@ public class LaunchSpecification {
/**
* The IAM Instance Profile (IIP) associated with the instance.
*/
- @SinceApiVersion("2014-02-01")
+ @SinceApiVersion("2012-06-01")
public Optional<IAMInstanceProfileRequest> getIAMInstanceProfile() {
return iamInstanceProfile;
}
@@ -510,7 +510,7 @@ public class LaunchSpecification {
+ ", iamInstanceProfile=" + iamInstanceProfile.orNull() + "]";
}
- @SinceApiVersion("2014-02-01")
+ @SinceApiVersion("2012-06-01")
public static class IAMInstanceProfileRequest {
public static IAMInstanceProfileRequest forArn(String arn) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ff6da3ab/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/options/AWSRunInstancesOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/options/AWSRunInstancesOptions.java b/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/options/AWSRunInstancesOptions.java
index ce4c014..78b3648 100644
--- a/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/options/AWSRunInstancesOptions.java
+++ b/dependencies/jclouds/provider/aws-ec2/1.7.1-stratos/src/main/java/org/jclouds/aws/ec2/options/AWSRunInstancesOptions.java
@@ -121,7 +121,7 @@ public class AWSRunInstancesOptions extends RunInstancesOptions {
*
* @see org.jclouds.aws.ec2.domain.AWSRunningInstance#getIAMInstanceProfile()
*/
- @SinceApiVersion("2014-02-01")
+ @SinceApiVersion("2012-06-01")
public AWSRunInstancesOptions withIAMInstanceProfileArn(String arn) {
formParameters.put("IamInstanceProfile.Arn", checkNotNull(arn, "arn"));
return this;
@@ -132,7 +132,7 @@ public class AWSRunInstancesOptions extends RunInstancesOptions {
*
* @see org.jclouds.aws.ec2.domain.AWSRunningInstance#getIAMInstanceProfile()
*/
- @SinceApiVersion("2014-02-01")
+ @SinceApiVersion("2012-06-01")
public AWSRunInstancesOptions withIAMInstanceProfileName(String name) {
formParameters.put("IamInstanceProfile.Name", checkNotNull(name, "name"));
return this;