mirror of https://github.com/apache/cloudstack.git
Conflicts: api/src/com/cloud/api/BaseCmd.java cloud.spec core/src/com/cloud/storage/template/DownloadManagerImpl.java server/src/com/cloud/agent/manager/AgentManagerImpl.java server/src/com/cloud/configuration/DefaultComponentLibrary.java server/src/com/cloud/deploy/FirstFitPlanner.java server/src/com/cloud/host/dao/HostDao.java server/src/com/cloud/network/security/SecurityGroupListener.java server/src/com/cloud/storage/StorageManagerImpl.java server/src/com/cloud/storage/listener/StoragePoolMonitor.java server/src/com/cloud/vm/UserVmManagerImpl.java server/src/com/cloud/vm/VirtualMachineManagerImpl.java utils/src/com/cloud/utils/SerialVersionUID.java |
||
|---|---|---|
| .. | ||
| resource | ||
| snapshot | ||
| template | ||
| DiskOfferingVO.java | ||
| GuestOSCategoryVO.java | ||
| GuestOSVO.java | ||
| JavaStorageLayer.java | ||
| LaunchPermissionVO.java | ||
| SecondaryStorage.java | ||
| SecondaryStorageLayer.java | ||
| SnapshotPolicyVO.java | ||
| SnapshotScheduleVO.java | ||
| SnapshotVO.java | ||
| StorageLayer.java | ||
| StoragePoolDetailVO.java | ||
| StoragePoolDiscoverer.java | ||
| StoragePoolHostAssoc.java | ||
| StoragePoolHostVO.java | ||
| StoragePoolVO.java | ||
| StoragePoolWorkVO.java | ||
| Swift.java | ||
| SwiftVO.java | ||
| UploadVO.java | ||
| VMTemplateHostVO.java | ||
| VMTemplateStoragePoolVO.java | ||
| VMTemplateVO.java | ||
| VMTemplateZoneVO.java | ||
| VolumeVO.java | ||