mirror of https://github.com/apache/cloudstack.git
296b49c2f8
Conflicts: api/src/com/cloud/agent/api/BackupSnapshotCommand.java api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java api/src/com/cloud/network/NetworkService.java api/src/com/cloud/resource/ResourceService.java api/src/org/apache/cloudstack/api/ApiConstants.java api/src/org/apache/cloudstack/api/ResponseGenerator.java api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java client/tomcatconf/commands.properties.in core/src/com/cloud/storage/SnapshotVO.java pom.xml server/src/com/cloud/api/ApiDispatcher.java server/src/com/cloud/api/ApiResponseHelper.java server/src/com/cloud/api/ApiServer.java server/src/com/cloud/configuration/ConfigurationManagerImpl.java server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/rules/RulesManagerImpl.java server/src/com/cloud/offerings/NetworkOfferingVO.java server/src/com/cloud/resource/ResourceManagerImpl.java server/src/com/cloud/upgrade/dao/Upgrade40to41.java server/src/com/cloud/vm/UserVmManagerImpl.java server/test/com/cloud/vpc/MockNetworkManagerImpl.java setup/db/create-schema.sql setup/db/db/schema-40to410.sql Signed-off-by: Rohit Yadav <bhaisaab@apache.org> |
||
|---|---|---|
| .. | ||
| src/com/cloud | ||
| test/com/cloud/agent/transport | ||
| pom.xml | ||