hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aengin...@apache.org
Subject [19/19] hadoop git commit: Merge branch 'trunk' into HDFS-7240
Date Tue, 21 Jul 2015 18:25:22 GMT
Merge branch 'trunk' into HDFS-7240


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

Branch: refs/heads/HDFS-7240
Commit: 942e1ac213c86956c9f8b6fdf3c38e4dc5a84238
Parents: 8576861 3b7ffc4
Author: Anu Engineer <anu.engineer@gmail.com>
Authored: Tue Jul 21 11:14:40 2015 -0700
Committer: Anu Engineer <anu.engineer@gmail.com>
Committed: Tue Jul 21 11:14:40 2015 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt |  21 ++
 .../crypto/key/kms/KMSClientProvider.java       |   4 +-
 .../java/org/apache/hadoop/fs/FileStatus.java   |  15 +-
 .../org/apache/hadoop/fs/LocatedFileStatus.java |  10 +-
 .../fs/viewfs/ViewFsLocatedFileStatus.java      |   3 +-
 .../apache/hadoop/ipc/ProtobufRpcEngine.java    |   2 +-
 .../hadoop/security/UserGroupInformation.java   |   3 +-
 .../hadoop/security/token/SecretManager.java    |   2 +-
 .../org/apache/hadoop/security/token/Token.java |   2 +-
 .../hadoop/security/token/TokenIdentifier.java  |   2 +-
 .../apache/hadoop/security/token/TokenInfo.java |   2 +-
 .../hadoop/security/token/TokenRenewer.java     |   2 +-
 .../hadoop/security/token/TokenSelector.java    |   2 +-
 .../hadoop/security/token/package-info.java     |   2 +-
 .../org/apache/hadoop/fs/TestFileStatus.java    |  22 ++
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |  25 +-
 .../hadoop-hdfs/src/main/bin/hdfs               |   8 -
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |   3 +
 .../BlockInfoUnderConstruction.java             |  19 +-
 .../server/blockmanagement/BlockManager.java    |  14 +-
 .../blockmanagement/CorruptReplicasMap.java     |  19 +-
 .../hdfs/server/namenode/AclTransformation.java |  30 +-
 .../hdfs/server/namenode/FSNamesystem.java      |  10 +
 .../src/main/resources/hdfs-default.xml         |   9 +
 .../src/main/webapps/hdfs/dfshealth.html        |  25 ++
 .../src/main/webapps/hdfs/dfshealth.js          |   8 +
 .../markdown/HDFSHighAvailabilityWithNFS.md     |  40 ++-
 .../markdown/HDFSHighAvailabilityWithQJM.md     |  32 +-
 .../apache/hadoop/hdfs/TestLeaseRecovery.java   |  78 +++++
 .../blockmanagement/TestBlockStatsMXBean.java   |   1 -
 .../blockmanagement/TestCorruptReplicaInfo.java |  12 +-
 .../server/namenode/TestAclTransformation.java  |  55 ++-
 .../org/apache/hadoop/tools/HadoopArchives.java |  87 +++--
 .../apache/hadoop/tools/TestHadoopArchives.java |   4 +-
 hadoop-tools/hadoop-openstack/pom.xml           |   4 +-
 .../sls/scheduler/ResourceSchedulerWrapper.java |  10 +
 hadoop-yarn-project/CHANGES.txt                 |  13 +-
 .../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 +-
 67 files changed, 1133 insertions(+), 207 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/942e1ac2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
----------------------------------------------------------------------


Mime
View raw message