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
..
resources/META-INF/cloudstack/elb	Add missing licenses	2013-10-23 15:20:08 -07:00
src/com/cloud/network	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
pom.xml	Updating pom.xml version numbers for release 4.3.0	2014-01-21 17:29:51 -08:00