etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server
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
..
conf Removed bad word from log4j config files. 2011-02-08 13:55:40 -08:00
scripts Source code committed 2010-08-11 09:13:29 -07:00
src/com/cloud Merge branch 'cvm' 2011-08-08 14:14:09 -07:00
test bug 10409: added domainSuffix parameters to account/domain objects 2011-07-06 16:57:19 -07:00
.classpath classpath fix for server 2011-02-17 12:14:23 -08:00
.project Fix corrupted eclipse project settings, schema fixes and updated template download url 2010-09-29 18:41:54 -07:00