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
..
api	CLOUDSTACK-3852: fix upload volume	2013-07-29 11:50:16 -07:00
components-api	Added missing files	2013-07-16 11:24:21 -07:00
compute	CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms	2013-02-20 16:42:56 +05:30
network	CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms	2013-02-20 16:42:56 +05:30
orchestration	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
planning/src/org/apache/cloudstack/platform/planning	Added engine	2012-11-05 09:14:14 -08:00
schema	CLOUDSTACK-3510	2013-07-29 11:50:15 -07:00
service	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
storage	CLOUDSTACK-3852: fix upload volume	2013-07-29 11:50:16 -07:00
pom.xml	integration test is passed again	2013-05-12 14:41:06 -07:00