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 ac...@apache.org on 2014/11/13 03:51:57 UTC
hadoop git commit: HDFS-7391. Renable SSLv2Hello in HttpFS.
Contributed by Robert Kanter.
Repository: hadoop
Updated Branches:
refs/heads/trunk 87818ef4e -> 9f0319bba
HDFS-7391. Renable SSLv2Hello in HttpFS. Contributed by Robert Kanter.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9f0319bb
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9f0319bb
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9f0319bb
Branch: refs/heads/trunk
Commit: 9f0319bba1788e4c579ce533b14c0deab63f28ee
Parents: 87818ef
Author: Arun C. Murthy <ac...@apache.org>
Authored: Wed Nov 12 18:51:46 2014 -0800
Committer: Arun C. Murthy <ac...@apache.org>
Committed: Wed Nov 12 18:51:46 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/9f0319bb/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..c91c2e2 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" sslEnabledProtocols="TLSv1,SSLv2Hello"
keystoreFile="${httpfs.ssl.keystore.file}"
keystorePass="${httpfs.ssl.keystore.pass}"/>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f0319bb/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 cd8814e..7874b91 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1430,6 +1430,8 @@ Release 2.6.0 - 2014-11-15
HDFS-7387. NFS may only do partial commit due to a race between COMMIT and write
(brandonli)
+ HDFS-7391. Renable SSLv2Hello in HttpFS. (rkanter via acmurthy)
+
Release 2.5.2 - 2014-11-10
INCOMPATIBLE CHANGES