Alena Prokharchyk 31f9d718fb Merge branch 'master' into vpc ... Conflicts: server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java		2012-07-03 17:32:50 -07:00
..
ovm	License header updates for the ovm folder from Chip Childers	2012-07-02 09:52:55 -04:00
vmware	Merge branch 'master' into vpc	2012-06-28 17:44:08 -07:00
xen	CS-6840: Add hypervisor commands for site-to-site vpn	2012-07-02 16:28:44 -07:00