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
..
deploy	Add license header to files	2011-04-14 11:23:14 -07:00
.gitignore	more changes for the rewrite.	2010-08-16 11:28:11 -07:00
.project	bug 5890,5873: Try multiple bug checkins	2010-08-11 09:59:25 -07:00
build-cloud.properties	Make secondary storage VM support premium version and opensource version	2011-02-18 17:10:20 -08:00
build-cloud.xml	Revert "bug 10435: removed vpn feature"	2011-08-02 18:12:57 -07:00
build-common.xml	bug 8529: propagated to master. Added junit test support to ant	2011-02-16 17:40:58 -08:00
build-docs.xml	Source code committed	2010-08-11 09:13:29 -07:00
cloud.properties	fixed a template creation bug	2011-06-28 17:55:21 -07:00
developer.xml	Ant target for apiDocs building	2011-06-07 11:21:07 -07:00
overview.html	Source code committed	2010-08-11 09:13:29 -07:00
package.xml	hopefully the last of libre cleanup	2011-06-04 14:44:21 -04:00
release-notes	Source code committed	2010-08-11 09:13:29 -07:00
replace.properties	bug 7722: open vswitch - align some data type with master branch	2011-01-08 17:31:00 -08:00