etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/client/tomcatconf
History
Frank 6c819c1491 Merge branch 'bareMetal' 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/commands/DeployVMCmd.java
	api/src/com/cloud/offering/ServiceOffering.java
	api/src/com/cloud/vm/UserVmService.java
	client/tomcatconf/components.xml.in
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/service/ServiceOfferingVO.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
 		2011-03-08 14:18:11 -08: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 'bareMetal' 2011-03-08 14:18:11 -08:00
components.xml.in Merge branch 'bareMetal' 2011-03-08 14:18:11 -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 Removed bad word from log4j config files. 2011-02-08 13:55:40 -08: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 7908 resolved fixed. 2011-01-13 23:02:51 -08:00
web.xml.in Source code committed 2010-08-11 09:13:29 -07:00