You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aw...@apache.org on 2015/06/30 21:01:40 UTC
[27/27] hadoop git commit: Merge branch 'trunk' into HADOOP-12111
Merge branch 'trunk' into HADOOP-12111
Conflicts:
dev-support/test-patch.sh
hadoop-common-project/hadoop-common/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1c5ae8a8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1c5ae8a8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1c5ae8a8
Branch: refs/heads/HADOOP-12111
Commit: 1c5ae8a84609b45a3c42c02146f749134f1dce3e
Parents: 084becd 147e020
Author: Allen Wittenauer <aw...@apache.org>
Authored: Tue Jun 30 12:00:40 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Tue Jun 30 12:00:40 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 32 ++
.../java/org/apache/hadoop/fs/FileSystem.java | 146 +++++---
.../java/org/apache/hadoop/fs/shell/Delete.java | 17 +-
.../org/apache/hadoop/io/nativeio/NativeIO.c | 1 +
.../org/apache/hadoop/net/unix/DomainSocket.c | 8 +-
.../src/org/apache/hadoop/util/NativeCrc32.c | 4 +-
.../apache/hadoop/fs/FCStatisticsBaseTest.java | 56 ++-
.../java/org/apache/hadoop/fs/TestTrash.java | 14 +-
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 38 ++
.../hadoop-hdfs/src/main/bin/hdfs | 1 +
.../org/apache/hadoop/hdfs/DFSConfigKeys.java | 2 +-
.../server/blockmanagement/BlockManager.java | 15 +-
.../BlockPlacementPolicyDefault.java | 3 +-
.../blockmanagement/BlockStatsMXBean.java | 36 ++
.../CacheReplicationMonitor.java | 4 +-
.../blockmanagement/DatanodeDescriptor.java | 33 +-
.../server/blockmanagement/DatanodeManager.java | 26 +-
.../blockmanagement/DatanodeStatistics.java | 6 +
.../blockmanagement/DatanodeStorageInfo.java | 13 +-
.../blockmanagement/HeartbeatManager.java | 96 ++++-
.../blockmanagement/StorageTypeStats.java | 115 ++++++
.../hdfs/server/datanode/BlockScanner.java | 38 +-
.../hdfs/server/datanode/VolumeScanner.java | 8 +-
.../hdfs/server/namenode/FSDirTruncateOp.java | 361 +++++++++++++++++++
.../hdfs/server/namenode/FSDirectory.java | 95 -----
.../hdfs/server/namenode/FSEditLogLoader.java | 6 +-
.../hdfs/server/namenode/FSNamesystem.java | 237 ++----------
.../org/apache/hadoop/hdfs/tools/DFSck.java | 1 -
.../hdfs/tools/DelegationTokenFetcher.java | 19 +-
.../src/main/resources/hdfs-default.xml | 9 +-
.../src/site/markdown/HDFSCommands.md | 10 +-
.../org/apache/hadoop/hdfs/TestDFSShell.java | 26 ++
.../blockmanagement/TestBlockStatsMXBean.java | 146 ++++++++
.../fsdataset/impl/TestFsDatasetImpl.java | 1 +
.../hdfs/server/namenode/TestDeadDatanode.java | 42 +++
.../hdfs/server/namenode/TestFileTruncate.java | 8 +-
.../hdfs/tools/TestDelegationTokenFetcher.java | 15 +
hadoop-mapreduce-project/CHANGES.txt | 12 +
.../hadoop/fs/azure/NativeAzureFileSystem.java | 5 +-
hadoop-tools/hadoop-pipes/src/CMakeLists.txt | 49 ++-
hadoop-yarn-project/CHANGES.txt | 24 ++
.../hadoop/yarn/client/cli/RMAdminCLI.java | 10 +-
.../hadoop/yarn/client/cli/TestRMAdminCLI.java | 4 +
.../impl/pb/SerializedExceptionPBImpl.java | 2 +-
.../apache/hadoop/yarn/client/ServerProxy.java | 21 +-
.../impl/pb/TestSerializedExceptionPBImpl.java | 12 +-
.../containermanager/TestNMProxy.java | 81 +++--
.../scheduler/capacity/LeafQueue.java | 3 +-
48 files changed, 1410 insertions(+), 501 deletions(-)
----------------------------------------------------------------------