mirror of https://github.com/apache/cloudstack.git
6c819c1491
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 |
||
|---|---|---|
| .. | ||
| DataCenterDeployment.java | ||
| DeployDestination.java | ||
| DeploymentPlan.java | ||
| DeploymentPlanner.java | ||