Alena Prokharchyk ce9f1afa78 Merge branch 'master' into vpc ... Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java		2012-08-01 19:04:28 -07:00
..
kvm	Merge branch 'master' into vpc	2012-08-01 19:04:28 -07:00
ovm	bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager	2012-07-27 23:37:46 -04:00
vmware	VPC: replaced vmTo object with vmName parameter in plug/unplugNic commands	2012-08-01 18:19:03 -07:00
xen	VPC: replaced vmTo object with vmName parameter in plug/unplugNic commands	2012-08-01 18:19:03 -07:00