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

..

src/com/cloud

Merge branch 'bareMetal'

2011-03-08 14:18:11 -08:00

.classpath

Use exports for jar dependecy

2011-02-01 11:10:37 -08:00

.project

Source code committed

2010-08-11 09:13:29 -07:00