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
..
conf	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
resources/com/cloud/upgrade	CLOUDSTACK-1818: add a missing file that is missed in previous patch	2013-03-29 11:12:36 -07:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	CLOUDSTACK-3852: fix upload volume	2013-07-29 11:50:16 -07:00
test	CLOUDSTACK-3779: Support System vm scaling on VMWare	2013-07-29 15:25:07 +05:30
pom.xml	Removed schema from the dependency of many components	2013-07-29 10:55:19 -07:00