cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject git commit: updated refs/heads/4.2 to feeffea
Date Mon, 15 Jul 2013 04:25:23 GMT
Updated Branches:
  refs/heads/4.2 8de3b4f46 -> feeffeaf1


CLOUDSTACK-3463: [Portable IP] [EIP/ELB Zone] EIP semantics are not
intact with portable IP

fix ensures that, on release of portable IP associated with 'EIP
enabled' basic zone vm, a new system public IP is allocated and
associated with the VM


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/feeffeaf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/feeffeaf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/feeffeaf

Branch: refs/heads/4.2
Commit: feeffeaf10d845f0493c353fbc609e994483759a
Parents: 8de3b4f
Author: Murali Reddy <muralimmreddy@gmail.com>
Authored: Mon Jul 15 09:50:41 2013 +0530
Committer: Murali Reddy <muralimmreddy@gmail.com>
Committed: Mon Jul 15 09:50:41 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/network/NetworkServiceImpl.java | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/feeffeaf/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index d4f9030..f8f6044 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -903,9 +903,6 @@ public class NetworkServiceImpl extends ManagerBase implements  NetworkService
{
         boolean success = _networkMgr.disassociatePublicIpAddress(ipAddressId, userId, caller);
 
         if (success) {
-            if (ipVO.isPortable()) {
-                return success;
-            }
             Long networkId = ipVO.getAssociatedWithNetworkId();
             if (networkId != null) {
                 Network guestNetwork = getNetwork(networkId);


Mime
View raw message