cloudstack/engine
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
..
api Updating pom.xml version numbers for release 4.4.3-SNAPSHOT 2014-11-25 15:36:02 +01:00
components-api Updating pom.xml version numbers for release 4.4.3-SNAPSHOT 2014-11-25 15:36:02 +01:00
network Updating pom.xml version numbers for release 4.4.3-SNAPSHOT 2014-11-25 15:36:02 +01:00
orchestration CLOUDSTACK-8160: use preferable protocols 2015-01-21 18:11:38 +05:30
schema upgrade path 2015-01-09 16:10:06 +01:00
service Updating pom.xml version numbers for release 4.4.3-SNAPSHOT 2014-11-25 15:36:02 +01:00
storage CLOUDSTACK-8164: Look for all host to avoid NPE 2015-01-19 11:32:52 +05:30
pom.xml Updating pom.xml version numbers for release 4.4.3-SNAPSHOT 2014-11-25 15:36:02 +01:00