mirror of https://github.com/apache/cloudstack.git
Also factor out NicProfile specific methods and fix some DI config. Conflicts: server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java |
||
|---|---|---|
| .. | ||
| META-INF/cloudstack | ||
| com/cloud/upgrade | ||