Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0561110792 for ; Thu, 4 Jul 2013 16:01:04 +0000 (UTC) Received: (qmail 82481 invoked by uid 500); 4 Jul 2013 16:01:03 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 82470 invoked by uid 500); 4 Jul 2013 16:01:02 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 82463 invoked by uid 99); 4 Jul 2013 16:01:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jul 2013 16:01:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1F6C682ACE2; Thu, 4 Jul 2013 16:01:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: muralireddy@apache.org To: commits@cloudstack.apache.org Message-Id: <27b6668f39934e57ad569db689dae437@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to a8a23c4 Date: Thu, 4 Jul 2013 16:01:01 +0000 (UTC) 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 Authored: Thu Jul 4 21:27:29 2013 +0530 Committer: Murali Reddy 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;