Alex Huang 8d21f49ec9 Another merge to pull in object store fix. Also to check how changes that are applied to both master and vmsync are merged		2013-07-03 15:01:23 -07:00
..
applicationContext.xml.in	Another merge from master. This is just getting laborious	2013-07-01 11:29: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	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	Baremetal: Move list APIs to the correct location	2013-07-01 15:19:39 -07:00
componentContext.xml.in	Another merge from master. This is just getting laborious	2013-07-01 11:29:57 -07:00
context.xml.in	Source code committed	2010-08-11 09:13:29 -07:00
db.properties.in	Sync master to javelin one more time	2013-02-01 11:37:33 -08: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	CLOUDSTACK-2947: fix create template from snapshot, in case of mix zone-wide/cluster wide primary storage	2013-06-20 17:51:11 -07:00
logging.properties.in	Source code committed	2010-08-11 09:13:29 -07:00
nonossComponentContext.xml.in	Another merge from master. This is just getting laborious	2013-07-01 11:29:57 -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
simulatorComponentContext.xml.in	Fix injection of datastoreproviders in nonoss context	2013-07-01 13:52:53 +05:30
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