mirror of https://github.com/apache/cloudstack.git
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com> Conflicts: api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java server/src/com/cloud/server/ManagementServerImpl.java server/src/com/cloud/vm/UserVmManagerImpl.java |
||
|---|---|---|
| .. | ||
| conf | ||
| resources | ||
| scripts | ||
| src | ||
| test | ||
| pom.xml | ||