cloudstack/server/src/com/cloud/hypervisor
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
..
kvm/discoverer Bug 8208 - bare metal provisioning 2011-02-25 18:58:07 -08:00
xen/discoverer bug 8380: use instance name 2011-03-01 14:07:30 -08:00
HypervisorGuruBase.java security group is per bridge 2011-02-28 12:16:40 -05:00
HypervisorGuruManager.java Update template and storage manager to allow hypervisor based command delegation 2011-02-18 11:37:50 -08:00
HypervisorGuruManagerImpl.java Update template and storage manager to allow hypervisor based command delegation 2011-02-18 11:37:50 -08:00
KVMGuru.java Add VMWare hypervisor guru 2010-11-30 09:40:53 -08:00
XenServerGuru.java fix boot from iso/attach iso/disks issue 2010-12-09 14:25:44 -08:00