Edison Su ae534388c0 CLOUDSTACK-3852: fix upload volume ... Conflicts: plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java server/src/com/cloud/template/TemplateManagerImpl.java		2013-07-29 11:50:16 -07:00
..
baremetal	Changed VirtualMachineProfile to be non-generic. From here on VirtualMachineManager will only manage vm instance. It doesn't understand the difference between different types of VMs. This makes the vmsync code to be generic across all vms.	2013-07-22 11:48:11 -07:00
kvm	Changed the log4j config files to log org.apache.cloudstack in debug and change the layout format	2013-07-26 20:35:49 -07:00
ovm	Removed the getByTypeAndId() method and replace it with getById method	2013-07-22 20:06:04 -07:00
simulator	Fix simulator and marvin	2013-07-28 10:21:34 +05:30
ucs	Removed all the extra mockito, inject, and junit dependencies. Changed any test/resource to test/resources and rely on the master pom to tell us where the resources are instead of each individual project	2013-07-26 16:34:08 -07:00
vmware	CLOUDSTACK-3852: fix upload volume	2013-07-29 11:50:16 -07:00
xen	CLOUDSTACK-3852: fix upload volume	2013-07-29 11:50:16 -07:00