Frank 6c819c1491 Merge branch 'bareMetal' ... Conflicts: api/src/com/cloud/api/ApiConstants.java api/src/com/cloud/api/commands/DeployVMCmd.java api/src/com/cloud/offering/ServiceOffering.java api/src/com/cloud/vm/UserVmService.java client/tomcatconf/components.xml.in server/src/com/cloud/agent/manager/AgentManagerImpl.java server/src/com/cloud/configuration/DefaultComponentLibrary.java server/src/com/cloud/deploy/FirstFitPlanner.java server/src/com/cloud/service/ServiceOfferingVO.java server/src/com/cloud/vm/UserVmManagerImpl.java server/src/com/cloud/vm/VirtualMachineManagerImpl.java		2011-03-08 14:18:11 -08:00
..
BareMetalVmService.java	Bug 8208 - bare metal provisioning	2011-02-24 14:07:10 -08:00
DiskProfile.java	Add local storage support for kvm	2011-03-01 19:51:43 -05:00
InstanceGroup.java	api refactoring	2010-11-21 12:00:21 -08:00
Nic.java	Fixed DB upgrade script - vm_type field can be NULL	2011-03-05 10:37:57 -08:00
NicProfile.java	bug 8146: Multiple network case (default network is Virtual) - for Direct networks dhcp servers set dns to the eth0 ip address of the domR belonging to virtualNetwork	2011-03-07 19:56:25 -08:00
ReservationContext.java	Harmony amongst gurus	2010-11-03 21:18:31 -07:00
RunningOn.java	more changes	2010-08-18 12:28:30 -07:00
UserVmService.java	Merge branch 'bareMetal'	2011-03-08 14:18:11 -08:00
VirtualMachine.java	Bug 8208 - bare metal provisioning	2011-02-24 19:22:34 -08:00
VirtualMachineProfile.java	Bug 8208 - bare metal provisioning	2011-02-25 18:58:07 -08:00
VmStats.java	moved all agent commands to api.	2011-01-20 09:54:05 -08:00