cloudstack/client/tomcatconf
Prachi Damle f84375442e Merge branch 'master' into rbac
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -08:00
..
applicationContext.xml.in delete old applicationContext 2013-12-10 11:49:10 +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.in CLOUDSTACK-5042: change cloud.keystore to cloudmanagementserver.keystore and install it (cherry picked from commit de448ec479) 2013-11-08 09:00:29 +01:00
commands.properties.in Merge branch 'master' into rbac 2014-02-04 12:07:32 -08:00
componentContext.xml.in Tested ACL for StartVmCmd using the new RoleBasedEntityAccessChecker 2013-10-10 00:46:06 -07:00
context.xml.in Source code committed 2010-08-11 09:13:29 -07:00
db.properties.in CLOUDSTACK-4916: Fixing the issue with DB HA when there are more than 2 db nodes (Issue was mysql DriverManager was returning salve db nodes on random basis which was causing issue) 2013-11-14 11:10:48 +05:30
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
nonossComponentContext.xml.in [CLOUDSTACK-4849] adding lxc to the spring context 2013-10-18 14:45:36 +02: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 Tested ACL for StartVmCmd using the new RoleBasedEntityAccessChecker 2013-10-10 00:46:06 -07:00
tomcat-users.xml.in Source code committed 2010-08-11 09:13:29 -07:00
tomcat6-nonssl.conf.in CLOUDSTACK-243: On management server, security for remote JMX connections is disabled Disabled JMX connections for both local and remote 2013-10-23 15:15:02 -07:00
tomcat6-ssl.conf.in CLOUDSTACK-243: On management server, security for remote JMX connections is disabled Disabled JMX connections for both local and remote 2013-10-23 15:15:02 -07:00
web.xml.in Source code committed 2010-08-11 09:13:29 -07:00