etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/api/src/com/cloud/offering
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
..
DiskOffering.java more unused fields removed 2011-01-28 15:37:00 -08:00
NetworkOffering.java 1) Added guestIpType to the network offering; create/listNetworkOffering apis got changed accordingly. 2011-02-24 15:36:01 -08:00
OfferingManager.java Source code committed 2010-08-11 09:13:29 -07:00
ServiceOffering.java Merge branch 'bareMetal' 2011-03-08 14:18:11 -08:00