cloudstack/client/tomcatconf
Rohit Yadav 53c0ab856a CLOUDSTACK-8160: use preferable protocols
(cherry picked from commit debfcdef78)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	client/tomcatconf/server7-nonssl.xml.in
	client/tomcatconf/server7-ssl.xml.in
	engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
	plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/NeutronRestApi.java
	plugins/network-elements/palo-alto/src/com/cloud/network/utils/HttpClientWrapper.java
	plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java
	plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java
	plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java
	pom.xml
	services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
	services/console-proxy/server/src/com/cloud/consoleproxy/util/RawHTTP.java
	systemvm/scripts/config_ssl.sh
	utils/src/com/cloud/utils/nio/NioClient.java
	utils/src/com/cloud/utils/rest/RESTServiceConnector.java
	utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
	vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
2015-01-21 18:24:54 +05:30
..
catalina.policy.in Source code committed 2010-08-11 09:13:29 -07:00
catalina.properties.in CLOUDSTACK-6892: Create separate package for the mysql HA component 2014-08-20 12:00:08 +02: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 CLOUDSTACK-5870: API support for retrieving user data 2014-11-26 22:06:44 +05:30
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-12-11 12:39:05 +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
server-nonssl.xml.in CLOUDSTACK-8160: use preferable protocols 2015-01-21 18:24:54 +05:30
server-ssl.xml.in CLOUDSTACK-8160: use preferable protocols 2015-01-21 18:24:54 +05:30
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