From 45bc79d135d79a62ef237b15e969d097878a7561 Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Tue, 29 Nov 2016 19:47:02 +0900 Subject: [PATCH] HADOOP-13812. Upgrade Tomcat to 6.0.48. Contributed by John Zhuge. (cherry picked from commit 00096dcc0c23af38e697cd7c6c29e3f00d744e54) (cherry picked from commit 0c895e8a62b4b69a020a5f004e97323520a1b1d0) --- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm | 2 +- .../hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm | 2 ++ hadoop-project/pom.xml | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 707c90e99c9..b9167b4cc54 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -4,6 +4,8 @@ Release 2.7.4 - UNRELEASED INCOMPATIBLE CHANGES + HADOOP-13812. Upgrade Tomcat to 6.0.48. (John Zhuge via aajisaka) + NEW FEATURES IMPROVEMENTS diff --git a/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm b/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm index 44b5bfb3122..fef6862cb60 100644 --- a/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm +++ b/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm @@ -216,7 +216,7 @@ The answer to "What is your first and last name?" (i.e. "CN") must be the hostna NOTE: You need to restart the KMS for the configuration changes to take effect. -$H4 KMS Access Control +NOTE: Some old SSL clients may use weak ciphers that are not supported by the KMS server. It is recommended to upgrade the SSL client. KMS ACLs configuration are defined in the KMS `etc/hadoop/kms-acls.xml` configuration file. This file is hot-reloaded when it changes. diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm index eb0a8c96594..ffc8f50552d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm @@ -115,3 +115,5 @@ The answer to "What is your first and last name?" (i.e. "CN") must be the hostna Start HttpFS. It should work over HTTPS. Using the Hadoop `FileSystem` API or the Hadoop FS shell, use the `swebhdfs://` scheme. Make sure the JVM is picking up the truststore containing the public key of the SSL certificate if using a self-signed certificate. + +NOTE: Some old SSL clients may use weak ciphers that are not supported by the HttpFS server. It is recommended to upgrade the SSL client. diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 176536341f5..fe6839843e4 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -79,7 +79,7 @@ 2.7.1 3.0.0 - 6.0.44 + 6.0.48 1.7