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:01:01 UTC
git commit: updated refs/heads/master to a8a23c4
Updated Branches:
refs/heads/master da9552b7f -> a8a23c436
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/a8a23c43
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a8a23c43
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a8a23c43
Branch: refs/heads/master
Commit: a8a23c4364db6efbf906963c1f7de015320209a5
Parents: da9552b
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:30:31 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/a8a23c43/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;