cloudstack/client/tomcatconf
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
..
catalina.policy.in Source code committed 2010-08-11 09:13:29 -07:00
catalina.properties.in Source code committed 2010-08-11 09:13:29 -07:00
classpath.conf.in Add database migration script directory to classpath 2011-03-16 16:53:57 -07:00
commands.properties.in Revert "bug 10435: removed vpn feature" 2011-08-02 18:12:57 -07:00
components.xml.in Add DB integrity checker, it checks: 2011-07-30 17:22:09 -07:00
context.xml.in Source code committed 2010-08-11 09:13:29 -07:00
db.properties.in Source code committed 2010-08-11 09:13:29 -07:00
ehcache.xml.in Source code committed 2010-08-11 09:13:29 -07:00
environment.properties.in Source code committed 2010-08-11 09:13:29 -07:00
log4j-cloud.xml.in more logging to figure out problems with gson 2011-07-11 14:18:12 -07:00
logging.properties.in Source code committed 2010-08-11 09:13:29 -07:00
server.xml.in bug 6149: changed default AJP port to avoid random port assignment at startup. 2010-10-19 18:34:22 -07:00
tomcat-users.xml.in Source code committed 2010-08-11 09:13:29 -07:00
tomcat6.conf.in Bug 9635 - set java heap size to 1 GB by defaul 2011-04-28 13:31:59 -07:00
web.xml.in Source code committed 2010-08-11 09:13:29 -07:00