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 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
..
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
conf Source code committed 2010-08-11 09:13:29 -07:00
src Merge branch 'bareMetal' 2011-03-08 14:18:11 -08:00
test utilities for db unit test 2011-02-28 14:40:02 -08:00
.classpath Fix Eclipse project settings for separation of JUnit 2011-02-17 09:55:05 -08:00
.project Source code committed 2010-08-11 09:13:29 -07:00