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
Murali Reddy a718d353f7 Merge branch 'master' into portablepublicip 
Conflicts:
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/addr/PublicIp.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/db/schema-410to420.sql
 		2013-05-13 21:22:19 +05:30
..
applicationContext.xml.in Merge branch 'master' into portablepublicip 2013-05-13 21:22:19 +05:30
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 portablepublicip 2013-05-13 21:22:19 +05:30
componentContext.xml.in merge master 2013-05-11 15:28:43 +05:30
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-712: Feature Syslog Enhancements 2013-03-29 09:53:05 +05:30
logging.properties.in Source code committed 2010-08-11 09:13:29 -07:00
nonossComponentContext.xml.in merge master 2013-05-11 15:28:43 +05:30
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 merge master 2013-05-11 15:28:43 +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