Darren Shepherd e3280bdba2 Merge remote-tracking branch 'origin/spring-modularization' ... Conflicts: client/tomcatconf/applicationContext.xml.in client/tomcatconf/nonossComponentContext.xml.in client/tomcatconf/simulatorComponentContext.xml.in framework/db/src/com/cloud/utils/db/Transaction.java plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java server/src/com/cloud/api/ApiServer.java server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java		2013-10-23 11:14:42 -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	CLOUDSTACK-2758: touch file for tomcat6 package change CVS 2013-1976	2013-06-05 17:00:47 +05:30
cloudmanagementserver.keystore	Bug 9479 - provide option for built in https	2011-09-01 16:01:28 -07:00
commands.properties.in	allow Domain Admin to list usage records in the domain	2013-10-21 14:30:17 +02:00
context.xml.in	Source code committed	2010-08-11 09:13:29 -07:00
db.properties.in	Summary: usage db connection missing url parameters property	2013-07-09 00:16:36 -06:00
ehcache.xml.in	License header update for the client folder	2012-08-01 13:49:10 -04:00
environment.properties.in	Added Mock ApiServer, Regions API calls with api keys	2012-10-17 14:16:36 +05:30
log4j-cloud.xml.in	Spring Modularization	2013-10-02 15:41:04 -07:00
logging.properties.in	Source code committed	2010-08-11 09:13:29 -07:00
server-nonssl.xml.in	api: Enable UTF-8 URI encoding for tomcat	2012-12-17 20:43:37 -08:00
server-ssl.xml.in	tomcat: Change some /etc/cloud paths to /etc/cloudstack	2013-03-31 14:16:31 +02:00
tomcat-users.xml.in	Source code committed	2010-08-11 09:13:29 -07:00
tomcat6-nonssl.conf.in	Summary: Re-adjusting tomcat memory settings per Rohit's emails	2013-02-19 15:30:42 -07:00
tomcat6-ssl.conf.in	tomcat: Change some /etc/cloud paths to /etc/cloudstack	2013-03-31 14:16:31 +02:00
web.xml.in	Source code committed	2010-08-11 09:13:29 -07:00