Repository: hadoop Updated Branches: refs/heads/branch-2 34a3faf18 -> 624e793ad refs/heads/trunk 9609b7303 -> 71269f709
HDFS-6998. warning message 'ssl.client.truststore.location has not been set' gets printed for hftp command. (Contributed by Xiaoyu Yao) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/71269f70 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/71269f70 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/71269f70 Branch: refs/heads/trunk Commit: 71269f70971dc7aa7bcb5e78b19cb3f04fdaa2f4 Parents: 9609b73 Author: arp <[email protected]> Authored: Fri Sep 5 11:14:10 2014 -0700 Committer: arp <[email protected]> Committed: Fri Sep 5 11:14:10 2014 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java | 2 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/71269f70/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java index aabb815..4b81e17 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java @@ -212,7 +212,7 @@ public class FileBasedKeyStoresFactory implements KeyStoresFactory { LOG.debug(mode.toString() + " Loaded TrustStore: " + truststoreLocation); trustManagers = new TrustManager[]{trustManager}; } else { - LOG.warn("The property '" + locationProperty + "' has not been set, " + + LOG.debug("The property '" + locationProperty + "' has not been set, " + "no TrustStore will be loaded"); trustManagers = null; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/71269f70/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 0772ea6..5c4aeea 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -610,6 +610,9 @@ Release 2.6.0 - UNRELEASED HDFS-6862. Add missing timeout annotations to tests. (Xiaoyu Yao via Arpit Agarwal) + HDFS-6998. warning message 'ssl.client.truststore.location has not been + set' gets printed for hftp command. (Xiaoyu Yao via Arpit Agarwal) + BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS HDFS-6387. HDFS CLI admin tool for creating & deleting an
