You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2013/07/04 18:02:22 UTC
git commit: updated refs/heads/4.2 to 3cf0711
Updated Branches:
refs/heads/4.2 a14a9c192 -> 3cf07118a
CLOUDSTACK-2045:[Multiple IPs Per Nic] This feature is not working well
in case of networks with external devices after GC
adding missing 'retrun false' for isNetworkReadyForGc for the networks
that use external network devices and has secondary IP's associated with
nics.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3cf07118
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3cf07118
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3cf07118
Branch: refs/heads/4.2
Commit: 3cf07118a8b19e14a1abe35d8096cbb3ea11ae4d
Parents: a14a9c1
Author: Murali Reddy <mu...@gmail.com>
Authored: Thu Jul 4 21:27:29 2013 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Thu Jul 4 21:32:01 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkModelImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3cf07118/server/src/com/cloud/network/NetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
index 21ef8bc..407bf70 100755
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -2143,6 +2143,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
// network rules. So prevent network GC.
if (secondaryIps != null && !secondaryIps.isEmpty() &&
networkIsConfiguredForExternalNetworking(network.getDataCenterId(), networkId)) {
+ return false;
}
return true;