Merge remote-tracking branch 'apache/trunk' into YARN-2928
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7788f977 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7788f977 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7788f977 Branch: refs/heads/YARN-2928 Commit: 7788f9773aab9c312b75834209d5debeda9d2820 Parents: 6bb198e bfbf076 Author: Zhijie Shen <zjs...@apache.org> Authored: Thu Feb 26 15:10:08 2015 -0800 Committer: Zhijie Shen <zjs...@apache.org> Committed: Thu Feb 26 15:10:08 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 11 + .../src/main/bin/hadoop-functions.sh | 2 +- .../crypto/key/kms/KMSClientProvider.java | 84 ++++- .../key/kms/LoadBalancingKMSClientProvider.java | 347 +++++++++++++++++++ .../hadoop-common/src/main/native/native.sln | 8 +- .../src/main/native/native.vcxproj | 40 +++ .../src/main/winutils/include/winutils.h | 5 +- .../src/main/winutils/libwinutils.c | 2 +- .../src/main/winutils/libwinutils.vcxproj | 64 +++- .../hadoop-common/src/main/winutils/service.c | 8 +- .../hadoop-common/src/main/winutils/task.c | 2 +- .../src/main/winutils/winutils.sln | 10 + .../src/main/winutils/winutils.vcxproj | 61 +++- .../src/site/markdown/RackAwareness.md | 5 +- .../kms/TestLoadBalancingKMSClientProvider.java | 166 +++++++++ .../hadoop-kms/src/main/conf/kms-env.sh | 2 +- .../hadoop-kms/src/main/libexec/kms-config.sh | 2 +- .../hadoop-kms/src/main/sbin/kms.sh | 2 +- .../hadoop/crypto/key/kms/server/TestKMS.java | 114 +++--- hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 2 +- .../src/main/conf/httpfs-env.sh | 53 ++- .../src/main/libexec/httpfs-config.sh | 206 +++-------- .../hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh | 114 ++++-- .../src/main/tomcat/ssl-server.xml | 135 -------- .../src/main/tomcat/ssl-server.xml.conf | 135 ++++++++ .../src/site/apt/ServerSetup.apt.vm | 159 --------- .../src/site/apt/UsingHttpTools.apt.vm | 87 ----- .../src/site/apt/index.apt.vm | 83 ----- .../src/site/markdown/ServerSetup.md.vm | 121 +++++++ .../src/site/markdown/UsingHttpTools.md | 62 ++++ .../src/site/markdown/index.md | 52 +++ hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 20 ++ hadoop-hdfs-project/hadoop-hdfs/pom.xml | 5 +- .../org/apache/hadoop/hdfs/DFSInputStream.java | 33 +- .../hdfs/server/datanode/DirectoryScanner.java | 26 +- .../hdfs/server/namenode/FSNamesystem.java | 3 + .../hdfs/server/namenode/NamenodeFsck.java | 59 +++- .../server/namenode/StoragePolicySummary.java | 257 ++++++++++++++ .../org/apache/hadoop/hdfs/tools/DFSck.java | 2 + .../src/main/native/libhdfs/os/windows/thread.c | 2 +- .../libhdfs/os/windows/thread_local_storage.c | 8 + .../src/main/webapps/hdfs/explorer.html | 2 + .../src/main/webapps/hdfs/explorer.js | 9 +- .../apache/hadoop/hdfs/TestRollingUpgrade.java | 48 ++- .../hadoop/hdfs/server/namenode/TestFsck.java | 159 ++++++++- .../namenode/TestStoragePolicySummary.java | 201 +++++++++++ hadoop-mapreduce-project/CHANGES.txt | 6 + .../java/org/apache/hadoop/mapred/JobConf.java | 6 +- .../hadoop/mapred/TaskCompletionEvent.java | 32 +- .../hadoop/mapreduce/TaskCompletionEvent.java | 32 +- .../org/apache/hadoop/conf/TestJobConf.java | 23 +- .../fs/azure/AzureNativeFileSystemStore.java | 29 +- .../hadoop-sls/src/main/bin/rumen2sls.sh | 2 +- hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh | 2 +- hadoop-yarn-project/CHANGES.txt | 7 + .../security/TestClientToAMTokens.java | 3 - .../hadoop-yarn-server-web-proxy/pom.xml | 4 - .../server/webproxy/WebAppProxyServlet.java | 46 +-- 58 files changed, 2290 insertions(+), 880 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7788f977/hadoop-yarn-project/CHANGES.txt ----------------------------------------------------------------------