Alena Prokharchyk e0e13434b9 CLOUDSTACK-5872: use List DS for storing NicProfiles as public network can have more than one nic ... Conflicts: server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java		2014-03-05 13:35:43 -08:00
..
src/org/apache/cloudstack/network/contrail	CLOUDSTACK-5872: use List DS for storing NicProfiles as public network can have more than one nic	2014-03-05 13:35:43 -08:00
test	Add L3VPN isolation method for contrail plugin	2014-01-14 13:52:40 -08:00
pom.xml	Addon on Davids fix. Fix runtime dependency in awsapi/pom.xml. Set dependency for mysql in juniper contrail to test, as it is only required for integration testing.	2014-02-24 10:08:01 +01:00