Sheng Yang 8d4079d477 CS-6840: Add hypervisor commands for site-to-site vpn ...

Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java

2012-07-02 16:28:44 -07:00

..

ovm

Change OVM script deploy target in line with Alex re-packaging change

2012-06-20 10:45:56 -07: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