cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 3f18f18
Date Thu, 19 Sep 2013 14:48:20 GMT
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 <dhoogland@schubergphilis.com>
Authored: Thu Sep 19 16:25:24 2013 +0200
Committer: Daan Hoogland <dhoogland@schubergphilis.com>
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,


Mime
View raw message