mirror of https://github.com/apache/cloudstack.git
Conflicts: server/src/com/cloud/agent/AgentManager.java server/src/com/cloud/agent/manager/AgentManagerImpl.java server/src/com/cloud/host/dao/HostDao.java server/src/com/cloud/host/dao/HostDaoImpl.java server/src/com/cloud/resource/ResourceManagerImpl.java server/src/com/cloud/server/ManagementServerImpl.java server/src/com/cloud/storage/download/DownloadMonitorImpl.java server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java |
||
|---|---|---|
| .. | ||
| dao | ||
| guru | ||
| hyperv | ||
| kvm/discoverer | ||
| vmware | ||
| xen/discoverer | ||
| CloudZonesStartupProcessor.java | ||
| HypervisorGuruBase.java | ||
| HypervisorGuruManager.java | ||
| HypervisorGuruManagerImpl.java | ||
| KVMGuru.java | ||
| XenServerGuru.java | ||