Alena Prokharchyk a39fd61249 Merge branch 'master' into vpc ... Conflicts: server/src/com/cloud/network/rules/RulesManagerImpl.java server/src/com/cloud/vm/UserVmManagerImpl.java server/src/com/cloud/vm/VirtualMachineGuru.java		2012-07-27 13:47:46 -07:00
..
kvm	Bug: HA takes a lot of time to migrate VMs (trigger HA) to another KVM	2012-07-25 10:17:09 -07:00
xenserver	Merge branch 'master' into vpc	2012-07-06 12:04:10 -07:00
versions.sh	license header changes for scripts folder from Chip Childers	2012-06-23 00:58:00 -04:00