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	Merge branch 'master' into rbac.	2014-03-06 14:02:20 -08:00
network	CLOUDSTACK-8160: use preferable protocols	2015-01-21 18:11:38 +05:30