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
..
installer	license header changes for scripts folder from Chip Childers	2012-06-23 00:58:00 -04:00
network	CS-6840: Add hypervisor commands for site-to-site vpn	2012-07-02 16:28:44 -07:00
storage	license header changes for scripts folder from Chip Childers	2012-06-23 00:58:00 -04:00
util	license header changes for scripts folder from Chip Childers	2012-06-23 00:58:00 -04:00
vm	Merge branch 'master' into vpc	2012-06-28 17:44:08 -07:00
.classpath	Source code committed	2010-08-11 09:13:29 -07:00
.project	Committing Kris' big merge	2010-08-11 16:02:57 -07:00
.pydevproject	Open vSwitch tunnel manager	2012-04-23 22:32:16 +01:00