cloudstack/plugins/hypervisors
Rohit Yadav 0269456152 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
	plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java
	pom.xml
	services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
	utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
2015-01-21 18:11:38 +05:30
..
baremetal Updating pom.xml version numbers for release 4.4.3-SNAPSHOT 2014-11-25 15:36:02 +01:00
hyperv Updating pom.xml version numbers for release 4.4.3-SNAPSHOT 2014-11-25 15:36:02 +01:00
kvm CLOUDSTACK-2823: pass cmdline info to system vms for 30 times 2014-12-11 13:14:01 +05:30
ovm Updating pom.xml version numbers for release 4.4.3-SNAPSHOT 2014-11-25 15:36:02 +01:00
simulator Updating pom.xml version numbers for release 4.4.3-SNAPSHOT 2014-11-25 15:36:02 +01:00
ucs Updating pom.xml version numbers for release 4.4.3-SNAPSHOT 2014-11-25 15:36:02 +01:00
vmware CLOUDSTACK-8112. CS allows creation of VM's with the same Display name when vm.instancename.flag is set to true. 2014-12-23 21:52:23 +01:00
xen CLOUDSTACK-8160: use preferable protocols 2015-01-21 18:11:38 +05:30