From e221d18bcbe15d64ba2e43c186255a6f58896151 Mon Sep 17 00:00:00 2001 From: Chip Childers Date: Wed, 27 Mar 2013 13:20:01 +0000 Subject: [PATCH] Resolving merge issue after applying 8613db0 on top of 8a35898 Signed-off-by: Chip Childers --- server/src/com/cloud/network/NetworkServiceImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 83a2734b74c..0f2fc5a6ce6 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -2786,13 +2786,9 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { PhysicalNetworkVO pvo = _physicalNetworkDao.findById(physicalNetworkId); DataCenterVO dvo = _dcDao.findById(pvo.getDataCenterId()); if (dvo.getNetworkType() == NetworkType.Basic) { - - // Baremetal is currently disabled -/* addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalDhcpProvider", null, null); addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalPxeProvider", null, null); addProviderToPhysicalNetwork(physicalNetworkId, "BaremetaUserdataProvider", null, null); -*/ } return null; }