hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [7/7] hadoop git commit: Merge branch 'trunk' into HADOOP-12111
Date Mon, 06 Jul 2015 22:52:29 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/60343661
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/60343661
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/60343661

Branch: refs/heads/HADOOP-12111
Commit: 60343661c22ed528fc848d6962cec7e8e4bfe884
Parents: dcde7e4 47a69ec
Author: Allen Wittenauer <aw@apache.org>
Authored: Mon Jul 6 15:52:09 2015 -0700
Committer: Allen Wittenauer <aw@apache.org>
Committed: Mon Jul 6 15:52:09 2015 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt |   6 ++
 .../apache/hadoop/fs/RawLocalFileSystem.java    |  36 ++++---
 .../apache/hadoop/ha/ActiveStandbyElector.java  |  20 +++-
 .../org/apache/hadoop/net/NetworkTopology.java  |  59 ++++++-----
 .../org/apache/hadoop/fs/SymlinkBaseTest.java   |  45 +++++++--
 .../apache/hadoop/fs/TestLocalFileSystem.java   |  26 ++++-
 .../apache/hadoop/fs/TestSymlinkLocalFS.java    |  18 ++++
 .../hadoop/fs/shell/TestCopyPreserveFlag.java   |  63 ++++++------
 .../hadoop/ha/TestActiveStandbyElector.java     |  31 ++++++
 .../apache/hadoop/net/TestClusterTopology.java  |  75 +++++++++++++-
 .../apache/hadoop/hdfs/web/JsonUtilClient.java  |  14 +++
 .../hadoop/hdfs/web/WebHdfsFileSystem.java      |   2 +-
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |   3 +
 .../hdfs/server/namenode/FSXAttrBaseTest.java   |   5 +-
 .../TestOfflineImageViewerForXAttr.java         |   3 +
 hadoop-mapreduce-project/CHANGES.txt            |   3 +
 .../apache/hadoop/mapred/ShuffleHandler.java    |   3 +-
 .../hadoop/mapred/TestShuffleHandler.java       | 101 +++++++++++++++++++
 hadoop-yarn-project/CHANGES.txt                 |   3 +
 .../logaggregation/AggregatedLogFormat.java     |  83 ++++++++-------
 20 files changed, 465 insertions(+), 134 deletions(-)
----------------------------------------------------------------------



Mime
View raw message