hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [4/4] hadoop git commit: Merge branch 'trunk' into HADOOP-12111
Date Tue, 11 Aug 2015 14:44:35 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/16e792cf
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/16e792cf
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/16e792cf

Branch: refs/heads/HADOOP-12111
Commit: 16e792cf73205be14431db9197fc7ef3675a0d7b
Parents: 8726069 fa1d84a
Author: Allen Wittenauer <aw@apache.org>
Authored: Tue Aug 11 07:44:21 2015 -0700
Committer: Allen Wittenauer <aw@apache.org>
Committed: Tue Aug 11 07:44:21 2015 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |   3 +
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |   3 +
 .../hadoop/hdfs/server/balancer/Balancer.java   |  44 +++-
 .../hadoop/hdfs/server/balancer/Dispatcher.java | 101 +++++--
 .../hdfs/server/balancer/MovedBlocks.java       |   5 +
 .../hdfs/server/balancer/TestBalancer.java      |  21 +-
 hadoop-yarn-project/CHANGES.txt                 |   6 +
 .../resourcemanager/recovery/RMStateStore.java  |   5 +
 .../scheduler/AbstractYarnScheduler.java        |   7 +
 .../scheduler/SchedulerApplicationAttempt.java  |   2 +-
 .../scheduler/YarnScheduler.java                |  11 +
 .../scheduler/capacity/CapacityScheduler.java   |  67 +++--
 .../capacity/CapacitySchedulerContext.java      |   2 -
 .../scheduler/capacity/LeafQueue.java           |  55 ++--
 .../AbstractComparatorOrderingPolicy.java       |   6 +
 ...pacityPreemptionPolicyForNodePartitions.java |  10 +-
 .../capacity/TestApplicationLimits.java         |  14 +-
 .../capacity/TestApplicationPriority.java       | 260 +++++++++++++++++++
 .../capacity/TestCapacityScheduler.java         |  83 +++---
 .../scheduler/capacity/TestChildQueueOrder.java |   2 -
 .../scheduler/capacity/TestLeafQueue.java       |  49 ++--
 .../scheduler/capacity/TestParentQueue.java     |   2 -
 .../scheduler/capacity/TestReservations.java    |   2 -
 23 files changed, 592 insertions(+), 168 deletions(-)
----------------------------------------------------------------------



Mime
View raw message