mirror of https://github.com/apache/cloudstack.git
Conflicts: agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java server/src/com/cloud/agent/manager/AgentManagerImpl.java server/src/com/cloud/capacity/CapacityManagerImpl.java server/src/com/cloud/network/F5BigIpManagerImpl.java server/src/com/cloud/network/JuniperSrxManagerImpl.java server/src/com/cloud/resource/ResourceManagerImpl.java server/src/com/cloud/server/ManagementServerImpl.java server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java server/src/com/cloud/vm/UserVmManagerImpl.java server/src/com/cloud/vm/VirtualMachineManagerImpl.java utils/src/com/cloud/utils/db/GenericDao.java |
||
|---|---|---|
| .. | ||
| db | ||
| 22beta4to22GA.sql | ||
| 221to222upgrade.sh | ||
| create-database-premium.sql | ||
| create-database.sql | ||
| create-index-fk.sql | ||
| create-schema-premium.sql | ||
| create-schema-simulator.sql | ||
| create-schema.sql | ||
| data-20to21.sql | ||
| data-22beta1to22beta2.sql | ||
| deploy-db-dev.sh | ||
| deploy-db-simulator.sh | ||
| index-20to21.sql | ||
| index-212to213.sql | ||
| postprocess-20to21.sql | ||
| server-setup.sql | ||
| server-setup.xml | ||
| templates.kvm.sql | ||
| templates.simulator.sql | ||
| templates.sql | ||
| templates.vmware.sql | ||
| templates.xenserver.sql | ||