From 49c77cf0cfe7df5a11e3c800b5b50b6614309797 Mon Sep 17 00:00:00 2001
From: Alex Huang <alex@cloud.com>
Date: Tue, 7 Dec 2010 08:42:43 -0800
Subject: [PATCH] merge changes

---
 .../src/com/cloud/configuration/ConfigurationManagerImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 845d82fc76c..5b7778536ba 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -1074,7 +1074,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
                     throw new CloudRuntimeException("No default DirectPodBased network offering is found");
                 }
                 
-                List<NetworkVO> networks = _networkMgr.setupNetworkConfiguration(systemAccount, networkOffering.get(0), userNetwork, plan, null, null, true);
+                List<NetworkVO> networks = _networkMgr.setupNetwork(systemAccount, networkOffering.get(0), userNetwork, plan, null, null, true);
                 
                 if (networks == null || networks.isEmpty()) {
                     txn.rollback();