mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-03 04:12:31 +01:00
Conflicts: api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java