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/a7814e1a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a7814e1a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a7814e1a Branch: refs/heads/HDFS-6581 Commit: a7814e1aa440066ee20fde4c4992173d0b1514c1 Parents: a4dcbaa 8008f0e Author: arp <a...@apache.org> Authored: Mon Sep 15 15:30:19 2014 -0700 Committer: arp <a...@apache.org> Committed: Mon Sep 15 15:30:19 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 6 + .../src/main/conf/hadoop-policy.xml | 9 + .../src/main/conf/log4j.properties | 5 + .../main/java/org/apache/hadoop/ha/HAAdmin.java | 6 +- .../io/nativeio/SharedFileDescriptorFactory.c | 32 +- .../src/main/resources/core-default.xml | 86 ++ hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 8 + hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 9 + .../web/resources/DatanodeWebHdfsMethods.java | 13 +- .../apache/hadoop/hdfs/TestEncryptionZones.java | 62 ++ .../hdfs/tools/TestDFSHAAdminMiniCluster.java | 20 - hadoop-project/pom.xml | 26 +- hadoop-tools/hadoop-aws/pom.xml | 10 + .../fs/s3a/AnonymousAWSCredentialsProvider.java | 37 + .../fs/s3a/BasicAWSCredentialsProvider.java | 51 + .../org/apache/hadoop/fs/s3a/Constants.java | 90 ++ .../org/apache/hadoop/fs/s3a/S3AFileStatus.java | 62 ++ .../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 1019 ++++++++++++++++++ .../apache/hadoop/fs/s3a/S3AInputStream.java | 207 ++++ .../apache/hadoop/fs/s3a/S3AOutputStream.java | 208 ++++ .../services/org.apache.hadoop.fs.FileSystem | 1 + .../hadoop/fs/contract/s3a/S3AContract.java | 43 + .../fs/contract/s3a/TestS3AContractCreate.java | 38 + .../fs/contract/s3a/TestS3AContractDelete.java | 31 + .../fs/contract/s3a/TestS3AContractMkdir.java | 34 + .../fs/contract/s3a/TestS3AContractOpen.java | 31 + .../fs/contract/s3a/TestS3AContractRename.java | 64 ++ .../fs/contract/s3a/TestS3AContractRootDir.java | 35 + .../fs/contract/s3a/TestS3AContractSeek.java | 31 + .../fs/s3a/S3AFileSystemContractBaseTest.java | 327 ++++++ .../src/test/resources/contract/s3a.xml | 105 ++ .../src/test/resources/contract/s3n.xml | 7 +- hadoop-tools/hadoop-azure/pom.xml | 10 +- hadoop-yarn-project/CHANGES.txt | 8 + .../hadoop-yarn/conf/yarn-env.sh | 52 +- .../hadoop/yarn/conf/YarnConfiguration.java | 4 + .../ApplicationHistoryClientService.java | 15 +- .../authorize/TimelinePolicyProvider.java | 44 + .../hadoop-yarn-server-nodemanager/pom.xml | 14 +- 39 files changed, 2791 insertions(+), 69 deletions(-) ----------------------------------------------------------------------
