You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/09/22 09:22:00 UTC
[3/3] git commit: updated refs/heads/4.4 to b0b4845
CLOUDSTACK-1632
(cherry picked from commit 482b51476be4cf45aa002ea53fb68fd2c62bc5af)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b0b48456
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b0b48456
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b0b48456
Branch: refs/heads/4.4
Commit: b0b48456bb8b1034131b5b1484b62fa7dc8b10bc
Parents: 1cf3c28
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Sun Sep 21 15:56:47 2014 -0400
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Sep 22 09:19:55 2014 +0200
----------------------------------------------------------------------
.../user/securitygroup/AuthorizeSecurityGroupEgressCmd.java | 2 +-
.../user/securitygroup/AuthorizeSecurityGroupIngressCmd.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0b48456/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
index 9909bf3..f7339e9 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
@@ -97,7 +97,7 @@ public class AuthorizeSecurityGroupEgressCmd extends BaseAsyncCmd {
// This @ACL will not work, since we don't have a way to convert this parameter to the entity like securityGroupId.
//@ACL(accessType = AccessType.OperateEntry)
- @Parameter(name=ApiConstants.SECURITY_GROUP_NAME, type=CommandType.STRING, description="The name of the security group. Mutually exclusive with securityGroupName parameter")
+ @Parameter(name=ApiConstants.SECURITY_GROUP_NAME, type=CommandType.STRING, description="The name of the security group. Mutually exclusive with securityGroupId parameter")
private String securityGroupName;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0b48456/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
index 3549d51..a807386 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
@@ -97,7 +97,7 @@ public class AuthorizeSecurityGroupIngressCmd extends BaseAsyncCmd {
// This @ACL will not work, since we don't have a way to convert this parameter to the entity like securityGroupId.
//@ACL(accessType = AccessType.OperateEntry)
- @Parameter(name=ApiConstants.SECURITY_GROUP_NAME, type=CommandType.STRING, description="The name of the security group. Mutually exclusive with securityGroupName parameter")
+ @Parameter(name=ApiConstants.SECURITY_GROUP_NAME, type=CommandType.STRING, description="The name of the security group. Mutually exclusive with securityGroupId parameter")
private String securityGroupName;
/////////////////////////////////////////////////////