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
..
resources/META-INF/cloudstack	Add missing licenses	2013-10-23 15:20:08 -07:00
src	CLOUDSTACK-8160: use preferable protocols	2015-01-21 18:24:54 +05:30
test/com/cloud/hypervisor/xen/resource	fixing the test	2013-12-04 16:12:42 -08:00
pom.xml	cloudstack: change version to 4.3.2	2014-12-11 19:08:36 +05:30