mirror of https://github.com/apache/cloudstack.git
Conflicts: engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java setup/db/db/schema-410to420.sql |
||
|---|---|---|
| .. | ||
| dao | ||
| snapshot | ||
| MockUserVmManagerImpl.java | ||
| MockVirtualMachineManagerImpl.java | ||
| UserVmManagerTest.java | ||
| VirtualMachineManagerImplTest.java | ||