etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge issues

This commit is contained in:
Chiradeep Vittal 2011-08-11 16:52:58 -07:00
parent 2ef10a5993
commit ba3bb68035
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
View File

@ -276,9 +276,5 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Sta
public List<String> getSourceCidrList() {
return null;
}
public List<String> getSourceCidrList() {
return null;
}
}

3
api/src/com/cloud/api/response/CapabilitiesResponse.java
View File

@ -38,9 +38,6 @@ public class CapabilitiesResponse extends BaseResponse {
@SerializedName("supportELB") @Param(description="true if region supports elastic load balancer on basic zones")
private String supportELB;
@SerializedName("firewallRuleUiEnabled") @Param(description="true if the firewall rule UI is enabled")
private boolean firewallRuleUiEnabled;
public boolean getSecurityGroupsEnabled() {
return securityGroupsEnabled;
}