cloudstack/client/tomcatconf
Ragnar B. Johannsson 83b3580c32 Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss
Conflicts:
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/vm/UserVmVO.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2011-01-12 17:06:08 +00: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 Source code committed 2010-08-11 09:13:29 -07:00
commands.properties.in Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss 2011-01-12 17:06:08 +00:00
components.xml.in unit test working 2011-01-07 13:42:43 -08: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 Source code committed 2010-08-11 09:13:29 -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 Source code committed 2010-08-11 09:13:29 -07:00
web.xml.in Source code committed 2010-08-11 09:13:29 -07:00