Merge branch 'trunk' into HDFS-6581
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7f0422be Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7f0422be Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7f0422be Branch: refs/heads/trunk Commit: 7f0422be763b7ab6a60a0e90670e12661683f835 Parents: 1e6b4b9 c88c6c5 Author: arp <a...@apache.org> Authored: Mon Sep 29 16:29:43 2014 -0700 Committer: arp <a...@apache.org> Committed: Mon Sep 29 16:29:43 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 4 ++++ .../org/apache/hadoop/net/NetworkTopology.java | 25 ++++---------------- .../hadoop-kms/src/main/conf/kms-env.sh | 4 ++++ .../hadoop-kms/src/main/libexec/kms-config.sh | 7 ++++++ .../hadoop-kms/src/main/sbin/kms.sh | 1 + .../hadoop-kms/src/main/tomcat/server.xml | 1 + .../hadoop-kms/src/main/tomcat/ssl-server.xml | 2 +- .../hadoop-kms/src/site/apt/index.apt.vm | 2 ++ .../org/apache/hadoop/nfs/nfs3/IdUserGroup.java | 15 ++++++------ hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 5 ++++ .../java/org/apache/hadoop/hdfs/DFSClient.java | 3 +-- ...tNamenodeProtocolServerSideTranslatorPB.java | 4 +++- .../ClientNamenodeProtocolTranslatorPB.java | 6 ++++- .../server/namenode/EncryptionZoneManager.java | 6 +---- .../hdfs/server/namenode/FSDirectory.java | 3 +-- .../hadoop-hdfs/src/main/proto/encryption.proto | 2 +- hadoop-yarn-project/CHANGES.txt | 3 +++ .../FileSystemApplicationHistoryStore.java | 5 ++-- .../TestFileSystemApplicationHistoryStore.java | 8 +++---- 19 files changed, 58 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7f0422be/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java ----------------------------------------------------------------------