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
..
resources/META-INF/cloudstack/core	Spring Modularization	2013-10-02 15:41:04 -07:00
src/org/apache/cloudstack/network	CLOUDSTACK-6198: use List DS for storing NicProfiles as public network can have more than one nic	2014-03-04 15:37:52 -08:00
test	Reformatted all of the code.	2013-11-21 06:15:26 -08:00
pom.xml	Bump 4.3.0 to 4.4.0 in master	2013-11-21 16:01:15 +01:00