Repository: hadoop
Updated Branches:
refs/heads/branch-2.6.0 4cd37ffa8 -> d5304601d
HDFS-7391. Renable SSLv2Hello in HttpFS. Contributed by Robert Kanter.
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/d5304601
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d5304601
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d5304601
Branch: refs/heads/branch-2.6.0
Commit: d5304601d4af3671d3c4988edebacfd26cb6bd2a
Parents: 4cd37ff
Author: Arun C. Murthy <acmur...@apache.org>
Authored: Wed Nov 12 18:51:46 2014 -0800
Committer: Arun C. Murthy <acmur...@apache.org>
Committed: Wed Nov 12 19:01:55 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/d5304601/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/d5304601/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 26981a3..7b66c1e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -621,6 +621,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)
