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
..
src	CLOUDSTACK-3852: fix upload volume	2013-07-29 11:50:16 -07:00
test/com/cloud/hypervisor/xen/resource	CLOUDSTACK-2502: Scalevm and over provisioning should respect each other	2013-06-13 16:30:56 +05:30
pom.xml	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