From ba3bb68035443bad7d6158b8db2e446b0319d3c8 Mon Sep 17 00:00:00 2001
From: Chiradeep Vittal <chiradeep@cloud.com>
Date: Thu, 11 Aug 2011 16:52:58 -0700
Subject: [PATCH] fix merge issues

---
 .../com/cloud/api/commands/CreateIpForwardingRuleCmd.java   | 6 +-----
 api/src/com/cloud/api/response/CapabilitiesResponse.java    | 3 ---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java b/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
index 5011ee4f76c..261c00321ed 100644
--- a/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
+++ b/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
@@ -276,9 +276,5 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Sta
     public List<String> getSourceCidrList() {
         return null;
     }
-    
-    public List<String> getSourceCidrList() {
-        return null;
-    }
-    
+   
 }
diff --git a/api/src/com/cloud/api/response/CapabilitiesResponse.java b/api/src/com/cloud/api/response/CapabilitiesResponse.java
index ba4fbcef978..c4cc3539c79 100644
--- a/api/src/com/cloud/api/response/CapabilitiesResponse.java
+++ b/api/src/com/cloud/api/response/CapabilitiesResponse.java
@@ -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;
     }