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 aw...@apache.org on 2015/07/21 22:12:10 UTC
[16/16] hadoop git commit: Merge branch 'trunk' into HADOOP-12111
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/a3a4578c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a3a4578c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a3a4578c
Branch: refs/heads/HADOOP-12111
Commit: a3a4578cc98bbe1119587e88cc02bbdd6d20847f
Parents: b41fe31 5137b38
Author: Allen Wittenauer <aw...@apache.org>
Authored: Tue Jul 21 13:11:45 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Tue Jul 21 13:11:45 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 8 +
.../hadoop/security/UserGroupInformation.java | 3 +-
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 22 +-
.../hadoop-hdfs/src/main/bin/hdfs | 8 -
.../blockmanagement/CorruptReplicasMap.java | 19 +-
.../hdfs/server/namenode/AclTransformation.java | 30 +-
.../src/main/webapps/hdfs/dfshealth.html | 25 ++
.../src/main/webapps/hdfs/dfshealth.js | 8 +
.../markdown/HDFSHighAvailabilityWithNFS.md | 40 ++-
.../markdown/HDFSHighAvailabilityWithQJM.md | 32 +-
.../blockmanagement/TestBlockStatsMXBean.java | 1 -
.../blockmanagement/TestCorruptReplicaInfo.java | 12 +-
.../server/namenode/TestAclTransformation.java | 55 ++-
hadoop-mapreduce-project/CHANGES.txt | 3 +
.../mapreduce/v2/app/job/impl/JobImpl.java | 2 +
.../org/apache/hadoop/tools/HadoopArchives.java | 87 +++--
.../apache/hadoop/tools/TestHadoopArchives.java | 4 +-
.../fs/swift/snative/SwiftNativeFileSystem.java | 9 +
.../fs/swift/TestSwiftFileSystemBasicOps.java | 7 +
.../sls/scheduler/ResourceSchedulerWrapper.java | 10 +
hadoop-yarn-project/CHANGES.txt | 7 +
.../hadoop/yarn/conf/YarnConfiguration.java | 5 +
.../org/apache/hadoop/yarn/client/SCMAdmin.java | 2 +-
.../server/resourcemanager/RMAppManager.java | 20 +-
.../server/resourcemanager/rmapp/RMAppImpl.java | 15 +-
.../scheduler/AbstractYarnScheduler.java | 10 +
.../server/resourcemanager/scheduler/Queue.java | 8 +
.../scheduler/SchedulerApplication.java | 22 ++
.../scheduler/SchedulerApplicationAttempt.java | 15 +-
.../scheduler/YarnScheduler.java | 20 ++
.../scheduler/capacity/AbstractCSQueue.java | 7 +
.../scheduler/capacity/CapacityScheduler.java | 73 +++-
.../CapacitySchedulerConfiguration.java | 13 +
.../scheduler/capacity/LeafQueue.java | 19 +-
.../scheduler/common/fica/FiCaSchedulerApp.java | 8 +
.../scheduler/event/AppAddedSchedulerEvent.java | 28 +-
.../resourcemanager/scheduler/fair/FSQueue.java | 6 +
.../scheduler/fifo/FifoScheduler.java | 6 +
.../scheduler/policy/FifoComparator.java | 11 +-
.../scheduler/policy/SchedulableEntity.java | 5 +
.../yarn/server/resourcemanager/MockRM.java | 31 +-
.../server/resourcemanager/TestAppManager.java | 1 +
.../TestWorkPreservingRMRestart.java | 2 +-
...pacityPreemptionPolicyForNodePartitions.java | 1 +
.../capacity/TestApplicationLimits.java | 5 +-
.../capacity/TestApplicationPriority.java | 345 +++++++++++++++++++
.../capacity/TestCapacityScheduler.java | 5 +
.../scheduler/policy/MockSchedulableEntity.java | 13 +-
.../security/TestDelegationTokenRenewer.java | 10 +-
.../TestRMWebServicesAppsModification.java | 2 +-
.../src/site/markdown/ResourceManagerRestart.md | 32 +-
51 files changed, 961 insertions(+), 171 deletions(-)
----------------------------------------------------------------------