mirror of https://github.com/apache/cloudstack.git
Conflicts: server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java Conflicts: api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java |
||
|---|---|---|
| .. | ||
| resources/META-INF/cloudstack | ||
| src | ||
| test | ||
| pom.xml | ||