Alena Prokharchyk b61468d65c Merge branch 'master' into vpc ... Conflicts: plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java		2012-08-11 18:27:18 -07:00
..
kvm	Merge branch 'master' into vpc	2012-08-11 18:27:18 -07:00
ovm	License header updates for the plugins folder.	2012-08-03 09:07:43 -04:00
vmware	Merge branch 'master' into vpc	2012-08-08 18:38:35 -07:00
xen	S2S VPN: CS-15884: Delete iptables rules after delete vpn connection	2012-08-07 16:32:22 -07:00