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 |
||
|---|---|---|
| .. | ||
| bindir | ||
| certs | ||
| conf | ||
| src | ||
| test | ||
| .classpath | ||
| .project | ||
| LICENSE | ||