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
..
snapshot	bug 9663: do account permission check against the volume when create snapshot	2011-05-03 11:38:01 -07:00
template	Removed even more old code	2010-12-16 17:17:02 -08:00
GuestOS.java	api refactoring	2010-11-21 12:00:21 -08:00
GuestOsCategory.java	api refactoring	2010-11-21 12:00:21 -08:00
Snapshot.java	bug 8714: support paraleel recursive snapshot	2011-02-25 22:17:13 -08:00
Storage.java	Merge branch 'cvm'	2011-08-08 14:14:09 -07:00
StorageGuru.java	more changes	2010-09-27 15:14:38 -07:00
StoragePool.java	bug 8242: introducing the concept of work queue for storage; introducing storage states as opposed to using host states; using row locks as opposed to db table locks	2011-01-28 13:43:36 -08:00
StoragePoolStatus.java	Add license header to files	2011-04-14 11:23:14 -07:00
StorageService.java	add new option to force destroy vm when delete host, if the VMs are created on local storage	2011-07-08 13:49:05 -07:00
StorageStats.java	moved all agent commands to api.	2011-01-20 09:54:05 -08:00
Upload.java	Add license header to files	2011-04-14 11:23:14 -07:00
VMTemplateStorageResourceAssoc.java	moved all agent commands to api.	2011-01-20 09:54:05 -08:00
Volume.java	proxy agent	2011-05-17 07:12:58 -07:00
VolumeStats.java	moved all agent commands to api.	2011-01-20 09:54:05 -08:00