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 14EA310009 for ; Thu, 19 Sep 2013 14:48:24 +0000 (UTC) Received: (qmail 40696 invoked by uid 500); 19 Sep 2013 14:48:23 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 40641 invoked by uid 500); 19 Sep 2013 14:48:22 -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 40611 invoked by uid 99); 19 Sep 2013 14:48:20 -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, 19 Sep 2013 14:48:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 786A5887A4A; Thu, 19 Sep 2013 14:48:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Date: Thu, 19 Sep 2013 14:48:20 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: updated refs/heads/master to 3f18f18 Updated Branches: refs/heads/master a726bfdba -> 3f18f182b add networkofferid to search network for Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/284742ad Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/284742ad Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/284742ad Branch: refs/heads/master Commit: 284742ad11ffbacdb5bf2bbe8fe0c622b5009df8 Parents: b6d448d Author: Daan Hoogland Authored: Thu Sep 19 16:25:24 2013 +0200 Committer: Daan Hoogland Committed: Thu Sep 19 16:26:46 2013 +0200 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/284742ad/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 06c9526..52520d4 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -3869,7 +3869,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { //check if we need to create guest network Network privateNetwork = _networksDao.getPrivateNetwork(uriString, cidr, - networkOwnerId, pNtwk.getDataCenterId(), null); + networkOwnerId, pNtwk.getDataCenterId(), networkOfferingId); if (privateNetwork == null) { //create Guest network privateNetwork = _networkMgr.createGuestNetwork(ntwkOff.getId(), networkName, displayText, gateway, cidr, uriString,