etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/client
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
..
WEB-INF Bug 8655: Fixed text and translation for the new user security group network. 2011-02-25 17:49:01 -08:00
bindir bug 8314 - Iptables is being appended with same set of rules again and again on each re-installation of the management 2011-02-03 11:39:13 -08:00
distro add missing files 2011-01-06 12:25:50 -05:00
tomcatconf Merge branch 'bareMetal' 2011-03-08 14:18:11 -08:00
.classpath fixed all the broken thirdparty stuff 2011-01-31 10:51:01 -08:00
.project Source code committed 2010-08-11 09:13:29 -07:00