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/07/08 17:16:40 UTC
[12/12] hadoop git commit: Merge branch 'trunk' into HADOOP-12111
Merge branch 'trunk' into HADOOP-12111
Conflicts:
dev-support/releasedocmaker.py
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8243608f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8243608f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8243608f
Branch: refs/heads/HADOOP-12111
Commit: 8243608fdcccf8a33678d9ce66e8789e82e6025f
Parents: adbacf7 98e5926
Author: Allen Wittenauer <aw...@apache.org>
Authored: Wed Jul 8 08:15:55 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Wed Jul 8 08:15:55 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 10 +-
hadoop-common-project/hadoop-common/pom.xml | 5 +
.../hadoop/fs/sftp/SFTPConnectionPool.java | 303 +++++++++
.../apache/hadoop/fs/sftp/SFTPFileSystem.java | 671 +++++++++++++++++++
.../apache/hadoop/fs/sftp/SFTPInputStream.java | 130 ++++
.../org/apache/hadoop/fs/sftp/package-info.java | 19 +
.../java/org/apache/hadoop/fs/shell/Touch.java | 84 +++
.../java/org/apache/hadoop/fs/shell/Touchz.java | 84 ---
.../org/apache/hadoop/jmx/package-info.java | 5 +-
.../hadoop/fs/sftp/TestSFTPFileSystem.java | 308 +++++++++
.../hdfs/client/HdfsClientConfigKeys.java | 3 +-
.../hadoop/hdfs/protocol/ClientProtocol.java | 606 ++++++++---------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 9 +-
.../hdfs/server/blockmanagement/BlockInfo.java | 7 +-
.../blockmanagement/BlockInfoContiguous.java | 9 +-
.../BlockInfoUnderConstruction.java | 22 +-
.../BlockInfoUnderConstructionContiguous.java | 13 +-
.../server/blockmanagement/BlockManager.java | 143 ++--
.../hdfs/server/blockmanagement/BlocksMap.java | 4 +-
.../ContiguousBlockStorageOp.java | 7 +-
.../blockmanagement/CorruptReplicasMap.java | 62 +-
.../server/datanode/fsdataset/FsDatasetSpi.java | 149 ++--
.../server/datanode/fsdataset/FsVolumeSpi.java | 47 +-
.../hdfs/server/namenode/FSDirWriteFileOp.java | 6 +-
.../hdfs/server/namenode/FSEditLogLoader.java | 2 +-
.../hdfs/server/namenode/NamenodeFsck.java | 12 +-
.../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 10 +-
.../org/apache/hadoop/hdfs/DFSTestUtil.java | 6 +-
.../java/org/apache/hadoop/hdfs/TestQuota.java | 21 +
.../blockmanagement/BlockManagerTestUtil.java | 7 +-
.../server/blockmanagement/TestBlockInfo.java | 10 +-
.../blockmanagement/TestBlockManager.java | 10 +-
.../blockmanagement/TestCorruptReplicaInfo.java | 15 +-
hadoop-mapreduce-project/CHANGES.txt | 3 +
.../src/site/markdown/MapReduceTutorial.md | 2 +-
hadoop-project/pom.xml | 5 +
hadoop-yarn-project/CHANGES.txt | 5 +
.../apache/hadoop/yarn/util/package-info.java | 2 -
.../yarn/client/api/impl/package-info.java | 4 -
.../hadoop/yarn/client/api/package-info.java | 4 -
.../hadoop/yarn/factories/package-info.java | 2 -
.../yarn/factory/providers/package-info.java | 2 -
.../recovery/ZKRMStateStore.java | 3 +-
43 files changed, 2136 insertions(+), 695 deletions(-)
----------------------------------------------------------------------