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
..
installer	Cleanup some scripts	2011-01-19 10:08:30 -08:00
network/domr	bug 8370: pass in original params when calling delete during add	2011-02-08 16:41:27 -08:00
storage	bug 8783: user vm fs is crashed, use O_DIRECT instead of O_DSYNC/O_SYNC in qemu, aka cache=none. Hope we can reduce the possibility of guest vm crashed.	2011-03-01 16:38:23 -05:00
util	Bug 8208 - bare metal provisioning	2011-03-01 11:40:40 -08:00
vm	bug 6772: use vhd-util to coalesce snapshots into primary storage	2011-03-07 19:47:29 -08:00
.classpath	Source code committed	2010-08-11 09:13:29 -07:00
.project	Committing Kris' big merge	2010-08-11 16:02:57 -07:00
.pydevproject	Committing Kris' big merge	2010-08-11 16:02:57 -07:00