Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack

ke4qqq · ke4qqq · commit 71050bb37f10 · 2012-07-24T15:50:52.000-04:00
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1765,11 +1765,6 @@ public List<IPAddressVO> searchForIPAddresses(ListPublicIpAddressesCmd cmd) {
             vlanType = VlanType.VirtualNetwork;
         }
 
-        // don't show SSVM/CPVM ips
-        if (vlanType == VlanType.VirtualNetwork && (allocatedOnly)) {
-            sb.and("associatedNetworkId", sb.entity().getAssociatedWithNetworkId(), SearchCriteria.Op.NNULL);       
-        }
-
         SearchCriteria<IPAddressVO> sc = sb.create();
         if (isAllocated) {
           _accountMgr.buildACLSearchCriteria(sc, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
