cloudstack/client/tomcatconf
Murali Reddy fea98fa66b Merge branch 'master' into gslb-wip
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/Config.java
	setup/db/create-schema.sql
2013-03-11 14:28:26 +05:30
..
applicationContext.xml.in CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB usage can cause Spring to lose tack of its proxied object and therefore creates a massive amount of objects in memory 2013-03-05 19:03:30 -05: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 Revert classpath.conf.in to before .deb packaing merge 2013-02-28 19:45:46 +00:00
cloudmanagementserver.keystore Bug 9479 - provide option for built in https 2011-09-01 16:01:28 -07:00
commands.properties.in Merge branch 'master' into gslb-wip 2013-03-11 14:28:26 +05:30
componentContext.xml.in Fix the typo in componentContext.xml.in 2013-03-05 13:51:06 +05:30
components-cloudzones.xml.in License header update for the client folder 2012-08-01 13:49:10 -04:00
components-nonoss.xml.in jetty:run should use ${project.build.directory}/${project.build.finalName} directory 2012-10-11 12:08:28 -07:00
components.xml.in CLOUDSTACK-1450. AWSAPI server fails to start. 2013-03-01 15:23:39 +05:30
context.xml.in Source code committed 2010-08-11 09:13:29 -07:00
db-enc.properties.in removed some unused database connection properties 2012-12-13 22:46:29 -08: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 CLOUDSTACK-774 2013-02-21 15:48:08 -08:00
logging.properties.in Source code committed 2010-08-11 09:13:29 -07:00
nonossComponentContext.xml.in Merge branch 'master' into vim51_win8 2013-02-28 14:25:26 -08: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 Removing the merge conflict statements from git. 2013-01-30 17:04:57 -08:00
server.xml.in api: Enable UTF-8 URI encoding for tomcat 2012-12-17 20:43:37 -08: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 Summary: Re-adjusting tomcat memory settings per Rohit's emails 2013-02-19 15:30:42 -07:00
web.xml.in Source code committed 2010-08-11 09:13:29 -07:00