etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/utils
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
..
bindir If git build sccs file is present, catenate it to standard output with these brand new commands 2010-08-11 18:14:55 -07:00
certs Update fail-safe keystore with RSA private key 2011-07-25 18:55:06 -07:00
conf Source code committed 2010-08-11 09:13:29 -07:00
src Merge branch 'cvm' 2011-08-08 14:14:09 -07:00
test Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8 2011-07-27 17:41:38 -07:00
.classpath new log4j jar files and now the ability to get rid of the stupid cglib stack traces in our logs 2011-06-21 01:12:06 -07:00
.project Source code committed 2010-08-11 09:13:29 -07:00
LICENSE bug 9697: encode api response values 2011-06-10 18:10:44 -07:00