You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2014/01/31 18:29:02 UTC
[1/2] git commit: updated refs/heads/master to 1582801
Updated Branches:
refs/heads/master e8438f1b6 -> 158280181
generateAlert API: set max value of "description" parameter to match correspondig field's length in VO object
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/15828018
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/15828018
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/15828018
Branch: refs/heads/master
Commit: 158280181d61f463be32e2376159c868deafb511
Parents: 48361d8
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu Jan 30 16:40:52 2014 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Jan 31 09:21:55 2014 -0800
----------------------------------------------------------------------
.../cloudstack/api/command/admin/alert/GenerateAlertCmd.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15828018/api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java b/api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
index 620c5ed..3eaa053 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
@@ -48,7 +48,7 @@ public class GenerateAlertCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "Name of the alert", required = true)
private String name;
- @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "Alert description", required = true)
+ @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "Alert description", required = true, length = 999)
private String description;
@Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "Zone id for which alert is generated")
[2/2] git commit: updated refs/heads/master to 1582801
Posted by al...@apache.org.
Fixed listAutoScaleVmGroups: used to return incorrect value in lbruleid field (wrong parameter was used when search in firewall_rules table - profileId instead of lbRuleId)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/48361d8a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/48361d8a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/48361d8a
Branch: refs/heads/master
Commit: 48361d8a8bbfc5490f1afa01326ea477e1207e8e
Parents: e8438f1
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu Jan 30 15:40:32 2014 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Jan 31 09:21:55 2014 -0800
----------------------------------------------------------------------
server/src/com/cloud/api/ApiResponseHelper.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48361d8a/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index a50b3ee..4d9c2dd 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -30,8 +30,6 @@ import java.util.TimeZone;
import javax.inject.Inject;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.affinity.AffinityGroup;
@@ -147,6 +145,7 @@ import org.apache.cloudstack.region.Region;
import org.apache.cloudstack.usage.Usage;
import org.apache.cloudstack.usage.UsageService;
import org.apache.cloudstack.usage.UsageTypes;
+import org.apache.log4j.Logger;
import com.cloud.api.query.ViewResponseHelper;
import com.cloud.api.query.vo.AccountJoinVO;
@@ -2968,7 +2967,7 @@ public class ApiResponseHelper implements ResponseGenerator {
if (profile != null) {
response.setProfileId(profile.getUuid());
}
- FirewallRuleVO fw = ApiDBUtils.findFirewallRuleById(vmGroup.getProfileId());
+ FirewallRuleVO fw = ApiDBUtils.findFirewallRuleById(vmGroup.getLoadBalancerId());
if (fw != null) {
response.setLoadBalancerId(fw.getUuid());
}