etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/ui
History
frank 6aaf3d5ae0 Merge branch 'cvm' 
Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/storage/Storage.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	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/host/dao/HostDao.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java
 		2011-08-08 14:14:09 -07:00
..
css a CSS fix for IE7 2011-07-21 17:58:10 -07:00
custom Custom 3 folder removed 2011-04-11 10:32:52 -07:00
images bug 8655 : UI for new options in Advance Mode under Zone Wizard 2011-02-24 16:42:15 -08:00
jsp Merge branch 'cvm' 2011-08-08 14:14:09 -07:00
scripts Merge branch 'cvm' 2011-08-08 14:14:09 -07:00
test Add license header to files 2011-04-14 11:23:14 -07:00
.classpath Source code committed 2010-08-11 09:13:29 -07:00
.project Source code committed 2010-08-11 09:13:29 -07:00
favicon.ico Source code committed 2010-08-11 09:13:29 -07:00
index.jsp bug 7553: cloudStack - add files for new page "System Service Offering". 2011-05-31 13:23:18 -07:00