hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [3/3] hadoop git commit: Merge branch 'trunk' into HADOOP-12111
Date Fri, 31 Jul 2015 22:21:52 GMT
Merge branch 'trunk' into HADOOP-12111


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a6692bee
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a6692bee
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a6692bee

Branch: refs/heads/HADOOP-12111
Commit: a6692bee0b90b156654ba8ba557b16eb4c19f94e
Parents: 21e21b9 454da95
Author: Allen Wittenauer <aw@apache.org>
Authored: Fri Jul 31 15:21:35 2015 -0700
Committer: Allen Wittenauer <aw@apache.org>
Committed: Fri Jul 31 15:21:35 2015 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt |   8 +
 .../main/java/org/apache/hadoop/fs/FsShell.java |   8 +
 .../org/apache/hadoop/io/ReadaheadPool.java     |   4 +-
 .../org/apache/hadoop/io/nativeio/NativeIO.java |  83 +++++------
 .../org/apache/hadoop/io/nativeio/NativeIO.c    | 147 ++++++++++++-------
 .../java/org/apache/hadoop/fs/TestFsShell.java  |   6 +-
 .../apache/hadoop/io/nativeio/TestNativeIO.java |  90 ++++++++----
 .../hdfs/server/datanode/BlockReceiver.java     |  14 +-
 .../hdfs/server/datanode/BlockSender.java       |  11 +-
 .../server/datanode/TestCachingStrategy.java    |   5 +-
 .../hadoop/mapred/FadvisedChunkedFile.java      |   5 +-
 .../hadoop/mapred/FadvisedFileRegion.java       |   6 +-
 12 files changed, 249 insertions(+), 138 deletions(-)
----------------------------------------------------------------------



Mime
View raw message