Alena Prokharchyk ce9f1afa78 Merge branch 'master' into vpc ... Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java		2012-08-01 19:04:28 -07:00
..
Hypervisor.java	committing Chip Childers patches fixing licensing headers	2012-06-12 12:32:58 -04:00
HypervisorCapabilities.java	CS-15631 : Support for up to 16 VDIs per VM on XS 6.0 and above	2012-08-01 19:39:30 +05:30
HypervisorGuru.java	Plug nic support	2012-06-15 14:07:46 -07:00