alena 8d47c53735 Revert "bug 10435: removed vpn feature" ... This reverts commit ea9e1b5d138950e8de49fce7ffdbb12a1c72c560. Conflicts: api/src/com/cloud/api/ResponseGenerator.java scripts/vm/hypervisor/xenserver/vmops server/src/com/cloud/configuration/Config.java server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java		2011-08-02 18:12:57 -07:00
..
installer	Add license header to files	2011-04-14 11:23:14 -07:00
network	Revert "bug 10435: removed vpn feature"	2011-08-02 18:12:57 -07:00
storage	add RHEL 6.1 support	2011-07-29 19:14:15 -07:00
util	Bug 9887 - baremetal: support for image operation (create template from guest disk)	2011-07-18 13:57:03 -07:00
vm	Revert "bug 10435: removed vpn feature"	2011-08-02 18:12:57 -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	Committing Kris' big merge	2010-08-11 16:02:57 -07:00