hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acmur...@apache.org
Subject hadoop git commit: HDFS-7391. Renable SSLv2Hello in HttpFS. Contributed by Robert Kanter.
Date Thu, 13 Nov 2014 02:59:47 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 6e6439062 -> 7c6f03ba2


HDFS-7391. Renable SSLv2Hello in HttpFS. Contributed by Robert Kanter.

(cherry picked from commit 9f0319bba1788e4c579ce533b14c0deab63f28ee)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7c6f03ba
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7c6f03ba
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7c6f03ba

Branch: refs/heads/branch-2
Commit: 7c6f03ba20b9dc8a1b33d5405631c760a904a3bc
Parents: 6e64390
Author: Arun C. Murthy <acmurthy@apache.org>
Authored: Wed Nov 12 18:51:46 2014 -0800
Committer: Arun C. Murthy <acmurthy@apache.org>
Committed: Wed Nov 12 18:59:27 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/7c6f03ba/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/7c6f03ba/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 9b9d9ba..ef1ae2a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -790,6 +790,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)
+
     BREAKDOWN OF HDFS-6581 SUBTASKS AND RELATED JIRAS
   
       HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal)


Mime
View raw message