mirror of https://github.com/apache/cloudstack.git
Conflicts: server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java |
||
|---|---|---|
| .. | ||
| dao | ||
| guru | ||
| hyperv | ||
| kvm/discoverer | ||
| vmware | ||
| xen/discoverer | ||
| CloudZonesStartupProcessor.java | ||
| HypervisorGuruBase.java | ||
| HypervisorGuruManager.java | ||
| HypervisorGuruManagerImpl.java | ||
| KVMGuru.java | ||
| XenServerGuru.java | ||