Alena Prokharchyk
|
5a8d165afa
|
CLOUDSTACK-6198: use List DS for storing NicProfiles as public network can have more than one nic
Conflicts:
engine/api/src/com/cloud/vm/VirtualMachineManager.java
engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
|
2014-03-04 15:37:52 -08:00 |
Hugo Trippaers
Alex Huang