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
..
VirtualMachineGuru.java	Moved VirtualMachineManager into engine	2013-08-19 14:13:28 -07:00
VirtualMachineManager.java	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