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 ar...@apache.org on 2015/07/15 23:33:06 UTC
[6/6] hadoop git commit: Merge branch 'trunk' into HDFS-7240
Merge branch 'trunk' into HDFS-7240
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b0e5a349
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b0e5a349
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b0e5a349
Branch: refs/heads/HDFS-7240
Commit: b0e5a349f35f452b86b73faed69bebfe038817e5
Parents: 6da5a33 3ec0a04
Author: Arpit Agarwal <ar...@apache.org>
Authored: Wed Jul 15 14:28:48 2015 -0700
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Wed Jul 15 14:28:48 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 5 ++
.../apache/hadoop/fs/ByteBufferReadable.java | 4 ++
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 5 +-
.../TestBlockReportRateLimiting.java | 64 ++++++--------------
hadoop-mapreduce-project/CHANGES.txt | 2 +
.../jobhistory/JobHistoryEventHandler.java | 2 +-
hadoop-project/pom.xml | 2 +-
hadoop-yarn-project/CHANGES.txt | 3 +
.../hadoop-yarn-site/src/site/markdown/YARN.md | 22 +++----
9 files changed, 46 insertions(+), 63 deletions(-)
----------------------------------------------------------------------