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 |
||
|---|---|---|
| .. | ||
| commands | ||
| response | ||
| ApiConstants.java | ||
| BaseAsyncCmd.java | ||
| BaseAsyncCreateCmd.java | ||
| BaseCmd.java | ||
| BaseListAccountResourcesCmd.java | ||
| BaseListCmd.java | ||
| BaseListDomainResourcesCmd.java | ||
| BaseListProjectAndAccountResourcesCmd.java | ||
| BaseListTaggedResourcesCmd.java | ||
| Identity.java | ||
| IdentityMapper.java | ||
| IdentityService.java | ||
| Implementation.java | ||
| Parameter.java | ||
| PlugService.java | ||
| ResponseGenerator.java | ||
| ResponseObject.java | ||
| ServerApiException.java | ||