hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dran...@apache.org
Subject [9/9] hadoop git commit: Merge branch 'trunk' into HADOOP-12756
Date Tue, 20 Sep 2016 06:07:00 GMT
Merge branch 'trunk' into HADOOP-12756


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

Branch: refs/heads/HADOOP-12756
Commit: a49b3be38ed97a27f215afb996c6db516f5857d7
Parents: 22af6f8 e52d6e7
Author: Kai Zheng <kai.zheng@intel.com>
Authored: Wed Sep 21 14:03:21 2016 +0800
Committer: Kai Zheng <kai.zheng@intel.com>
Committed: Wed Sep 21 14:03:21 2016 +0800

----------------------------------------------------------------------
 .../hdfs/client/HdfsClientConfigKeys.java       |   3 -
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |   4 -
 .../hdfs/server/namenode/INodeDirectory.java    |   9 +-
 .../hadoop/tools/TestHdfsConfigFields.java      |   2 -
 .../apache/hadoop/tools/DistCpConstants.java    |   4 +
 .../apache/hadoop/tools/SimpleCopyListing.java  | 114 ++-
 .../apache/hadoop/tools/TestCopyListing.java    |  83 ++-
 .../scheduler/AppSchedulingInfo.java            |  96 +--
 .../scheduler/SchedulerApplicationAttempt.java  | 744 +++++++++++--------
 .../allocator/RegularContainerAllocator.java    |   2 +-
 .../scheduler/common/fica/FiCaSchedulerApp.java | 418 ++++++-----
 .../scheduler/fair/FSAppAttempt.java            | 465 ++++++------
 .../scheduler/TestAppSchedulingInfo.java        |  65 ++
 .../src/site/markdown/TimelineServiceV2.md      |   6 +
 14 files changed, 1240 insertions(+), 775 deletions(-)
----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message