mirror of https://github.com/apache/cloudstack.git
Conflicts: api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java server/src/com/cloud/network/element/CiscoNexusVSMElement.java server/src/com/cloud/network/element/ElasticLoadBalancerElement.java server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java server/src/com/cloud/network/element/NetscalerElement.java server/src/com/cloud/network/element/OvsElement.java server/src/com/cloud/network/element/VpcJuniperSRXExternalFirewallElement.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java server/src/com/cloud/network/vpc/VpcManagerImpl.java server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java server/src/com/cloud/storage/StorageManager.java |
||
|---|---|---|
| .. | ||
| snapshot | ||
| template | ||
| GuestOS.java | ||
| GuestOsCategory.java | ||
| Snapshot.java | ||
| Storage.java | ||
| StorageGuru.java | ||
| StoragePool.java | ||
| StoragePoolStatus.java | ||
| StorageService.java | ||
| StorageStats.java | ||
| Swift.java | ||
| Upload.java | ||
| VMTemplateStorageResourceAssoc.java | ||
| Volume.java | ||
| VolumeStats.java | ||