Alena Prokharchyk 0e0b75a041 Merge branch 'master' into vpc ... Conflicts: api/src/com/cloud/api/ApiConstants.java		2012-08-02 18:45:37 -07:00
..
kvm	Merge branch 'master' into vpc	2012-08-02 18:45:37 -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