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 zj...@apache.org on 2015/02/27 17:47:23 UTC
[7/8] hadoop git commit: Merge remote-tracking branch 'apache/trunk'
into YARN-2928
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/667f69c3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/667f69c3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/667f69c3
Branch: refs/heads/YARN-2928
Commit: 667f69c3627f12b45ee398e70a9055b5e31a8a86
Parents: 41a08ad 01a1621
Author: Zhijie Shen <zj...@apache.org>
Authored: Fri Feb 27 08:42:37 2015 -0800
Committer: Zhijie Shen <zj...@apache.org>
Committed: Fri Feb 27 08:42:37 2015 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +
.../main/java/org/apache/hadoop/io/MapFile.java | 143 +++++++++
.../java/org/apache/hadoop/io/TestMapFile.java | 56 ++++
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 9 +-
.../org/apache/hadoop/hdfs/DFSOutputStream.java | 3 +-
.../hadoop/hdfs/server/datanode/DataNode.java | 2 +-
.../hdfs/server/datanode/DirectoryScanner.java | 12 +-
.../apache/hadoop/hdfs/TestDFSOutputStream.java | 31 ++
.../server/datanode/TestDirectoryScanner.java | 9 +-
.../src/test/resources/testHDFSConf.xml | 4 +-
.../mapreduce/v2/hs/JobHistoryServer.java | 2 +
hadoop-yarn-project/CHANGES.txt | 6 +
.../hadoop/yarn/conf/YarnConfiguration.java | 9 +
.../src/main/resources/yarn-default.xml | 15 +
.../yarn/server/nodemanager/NodeManager.java | 4 +-
.../server/resourcemanager/ResourceManager.java | 3 +
.../recovery/FileSystemRMStateStore.java | 303 ++++++++++++++-----
.../recovery/TestFSRMStateStore.java | 5 +
.../yarn/server/webproxy/WebAppProxyServer.java | 2 +
19 files changed, 537 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/667f69c3/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------