Frank 6c819c1491 Merge branch 'bareMetal' ... Conflicts: api/src/com/cloud/api/ApiConstants.java api/src/com/cloud/api/commands/DeployVMCmd.java api/src/com/cloud/offering/ServiceOffering.java api/src/com/cloud/vm/UserVmService.java client/tomcatconf/components.xml.in 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/service/ServiceOfferingVO.java server/src/com/cloud/vm/UserVmManagerImpl.java server/src/com/cloud/vm/VirtualMachineManagerImpl.java		2011-03-08 14:18:11 -08:00
..
snapshot	bug 7563: create snapshot in async create method	2011-02-04 19:20:47 -08: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	Bug 8208 - bare metal provisioning	2011-02-24 14:07:10 -08: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	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
StorageService.java	bug 8637: throw ResourceAllocationException when resource limit is exceeded.	2011-02-18 12:26:58 -08:00
StorageStats.java	moved all agent commands to api.	2011-01-20 09:54:05 -08:00
Upload.java	api refactoring	2010-11-21 12:00:21 -08:00
VMTemplateStorageResourceAssoc.java	moved all agent commands to api.	2011-01-20 09:54:05 -08:00
Volume.java	latest work on db migration	2011-02-22 18:23:05 -08:00
VolumeStats.java	moved all agent commands to api.	2011-01-20 09:54:05 -08:00