You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ka...@apache.org on 2014/11/13 18:12:13 UTC
hadoop git commit: HDFS-7391. Renable SSLv2Hello in HttpFS. (Robert
Kanter via kasha)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.5 21d4fca8b -> 178831509
HDFS-7391. Renable SSLv2Hello in HttpFS. (Robert Kanter via kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/17883150
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/17883150
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/17883150
Branch: refs/heads/branch-2.5
Commit: 178831509f7ab3d586ff725079bc80912c4887f3
Parents: 21d4fca
Author: Karthik Kambatla <ka...@apache.org>
Authored: Thu Nov 13 09:12:05 2014 -0800
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Thu Nov 13 09:12:05 2014 -0800
----------------------------------------------------------------------
.../hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml | 2 +-
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/17883150/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
index 614b702..9e3f57f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
@@ -70,7 +70,7 @@
described in the APR documentation -->
<Connector port="${httpfs.http.port}" protocol="HTTP/1.1" SSLEnabled="true"
maxThreads="150" scheme="https" secure="true"
- clientAuth="false" sslEnabledProtocols="TLSv1"
+ clientAuth="false" protocols="TLSv1,SSLv2Hello"
keystoreFile="${httpfs.ssl.keystore.file}"
keystorePass="${httpfs.ssl.keystore.pass}"/>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/17883150/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 0cacaa8..a27bf6f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -14,6 +14,8 @@ Release 2.5.2 - UNRELEASED
HDFS-7274. Disable SSLv3 in HttpFS. (Robert Kanter via kasha)
+ HDFS-7391. Renable SSLv2Hello in HttpFS. (Robert Kanter via kasha)
+
Release 2.5.1 - 2014-09-05