mirror of
https://github.com/apache/cloudstack.git
synced 2025-12-17 02:53:18 +01:00
Conflicts: api/src/com/cloud/api/ApiConstants.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
Conflicts: api/src/com/cloud/api/ApiConstants.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java