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 ar...@apache.org on 2014/09/01 20:53:53 UTC
[11/11] git commit: Merge remote-tracking branch
'apache-commit/trunk' into HDFS-6581
Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/217dea77
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/217dea77
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/217dea77
Branch: refs/heads/HDFS-6581
Commit: 217dea7794872d666e9f5bb6b73c0320a490abdc
Parents: f65183e 258c7d0
Author: arp <ar...@apache.org>
Authored: Mon Sep 1 11:52:59 2014 -0700
Committer: arp <ar...@apache.org>
Committed: Mon Sep 1 11:52:59 2014 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 11 +
.../hadoop/crypto/key/JavaKeyStoreProvider.java | 1 +
.../apache/hadoop/crypto/key/KeyProvider.java | 20 ++
.../crypto/key/KeyProviderCryptoExtension.java | 51 ++--
.../hadoop/crypto/key/KeyProviderExtension.java | 1 +
.../apache/hadoop/crypto/key/UserProvider.java | 5 +-
.../crypto/key/kms/KMSClientProvider.java | 1 +
.../hadoop/security/alias/UserProvider.java | 5 -
.../crypto/key/TestCachingKeyProvider.java | 6 +
.../hadoop/crypto/key/TestKeyProvider.java | 17 +-
...TestKeyProviderDelegationTokenExtension.java | 13 +-
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +
.../security/TestRefreshUserMappings.java | 12 +-
.../src/site/markdown/HadoopArchives.md.vm | 12 +-
hadoop-project/pom.xml | 11 +-
.../org/apache/hadoop/tools/HadoopArchives.java | 12 +-
.../apache/hadoop/tools/TestHadoopArchives.java | 41 +++
.../hadoop/yarn/sls/nodemanager/NodeInfo.java | 27 +-
.../yarn/sls/scheduler/RMNodeWrapper.java | 11 -
hadoop-yarn-project/CHANGES.txt | 9 +
.../hadoop/yarn/api/records/ResourceOption.java | 2 +
.../UpdateNodeResourceResponse.java | 12 +-
.../records/impl/pb/ResourceOptionPBImpl.java | 33 ++-
.../pb/UpdateNodeResourceResponsePBImpl.java | 2 +-
.../server/resourcemanager/AdminService.java | 34 ++-
.../resourcemanager/ResourceTrackerService.java | 4 +-
.../server/resourcemanager/rmnode/RMNode.java | 12 -
.../resourcemanager/rmnode/RMNodeEventType.java | 3 +
.../resourcemanager/rmnode/RMNodeImpl.java | 86 ++++--
.../rmnode/RMNodeResourceUpdateEvent.java | 37 +++
.../scheduler/AbstractYarnScheduler.java | 29 ++
.../scheduler/SchedulerNode.java | 25 +-
.../scheduler/SchedulerUtils.java | 37 ---
.../scheduler/capacity/CapacityScheduler.java | 26 +-
.../event/NodeResourceUpdateSchedulerEvent.java | 43 +++
.../scheduler/event/SchedulerEventType.java | 1 +
.../scheduler/fair/AllocationConfiguration.java | 40 ++-
.../fair/AllocationFileLoaderService.java | 57 ++--
.../scheduler/fair/FSParentQueue.java | 9 +
.../resourcemanager/scheduler/fair/FSQueue.java | 39 ++-
.../scheduler/fair/FairScheduler.java | 33 ++-
.../scheduler/fair/QueueManager.java | 27 ++
.../scheduler/fifo/FifoScheduler.java | 12 +-
.../webapp/FairSchedulerPage.java | 31 +-
.../webapp/dao/FairSchedulerQueueInfo.java | 34 ++-
.../yarn/server/resourcemanager/MockNodes.java | 22 +-
.../yarn/server/resourcemanager/MockRM.java | 5 +-
.../resourcemanager/TestFifoScheduler.java | 85 ++++++
.../resourcemanager/TestRMNodeTransitions.java | 75 ++++-
.../resourcetracker/TestNMReconnect.java | 19 +-
.../capacity/TestCapacityScheduler.java | 107 ++++++-
.../fair/TestAllocationFileLoaderService.java | 64 +++--
.../scheduler/fair/TestFairScheduler.java | 285 ++++++++++++++++++-
.../scheduler/fifo/TestFifoScheduler.java | 24 +-
.../src/site/apt/FairScheduler.apt.vm | 38 ++-
55 files changed, 1335 insertions(+), 326 deletions(-)
----------------------------------------------------------------------