Alena Prokharchyk 7706a9c32f Merge branch 'master' into vpc ... Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/rules/RulesManagerImpl.java		2012-07-31 13:37:28 -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-31 13:37:28 -07:00
versions.sh	license header changes for scripts folder from Chip Childers	2012-06-23 00:58:00 -04:00