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 zj...@apache.org on 2015/01/16 19:31:38 UTC
[25/25] hadoop git commit: Merge remote-tracking branch
'apache/trunk' into YARN-2928
Merge remote-tracking branch 'apache/trunk' into YARN-2928
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/630f1cd4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/630f1cd4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/630f1cd4
Branch: refs/heads/YARN-2928
Commit: 630f1cd4470abbeccfda39ddc1a8777e966ed7da
Parents: fe7d0e7 000ca83
Author: Zhijie Shen <zj...@apache.org>
Authored: Fri Jan 16 10:30:06 2015 -0800
Committer: Zhijie Shen <zj...@apache.org>
Committed: Fri Jan 16 10:30:06 2015 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 15 +
.../hadoop-common/src/main/bin/hadoop | 8 +-
.../src/main/bin/hadoop-functions.sh | 11 +
.../hadoop/crypto/key/JavaKeyStoreProvider.java | 5 +-
.../java/org/apache/hadoop/fs/HardLink.java | 313 +-----------
.../java/org/apache/hadoop/fs/shell/Stat.java | 33 +-
.../main/java/org/apache/hadoop/ha/HAAdmin.java | 10 +-
.../org/apache/hadoop/http/HttpServer2.java | 1 +
.../hadoop/metrics2/lib/MetricsRegistry.java | 14 +
.../src/site/apt/FileSystemShell.apt.vm | 11 +-
.../crypto/key/TestKeyProviderFactory.java | 48 ++
.../java/org/apache/hadoop/fs/TestHardLink.java | 91 +---
.../hadoop/http/HttpServerFunctionalTest.java | 32 ++
.../org/apache/hadoop/http/TestHttpServer.java | 24 +-
.../apache/hadoop/http/TestSSLHttpServer.java | 15 +-
.../metrics2/lib/TestMetricsRegistry.java | 42 ++
.../src/test/resources/hdfs7067.keystore | Bin 0 -> 6067 bytes
.../src/test/resources/testConf.xml | 24 +-
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 23 +
.../hadoop-hdfs/src/main/bin/hdfs | 4 +-
.../hadoop-hdfs/src/main/bin/hdfs.cmd | 14 +-
.../hadoop/hdfs/BlockStorageLocationUtil.java | 19 +-
.../java/org/apache/hadoop/hdfs/DFSClient.java | 407 +++++++++++++---
.../hadoop/hdfs/DFSInotifyEventInputStream.java | 144 +++---
.../hadoop/hdfs/protocol/BlockListAsLongs.java | 60 ++-
.../hdfs/protocol/CacheDirectiveIterator.java | 10 +-
.../hadoop/hdfs/protocol/CachePoolIterator.java | 14 +-
.../apache/hadoop/hdfs/protocol/DatanodeID.java | 23 +-
.../hdfs/protocol/EncryptionZoneIterator.java | 15 +-
.../hdfs/server/namenode/FSNamesystem.java | 34 +-
.../hdfs/server/namenode/FSNamesystemLock.java | 22 -
.../org/apache/hadoop/hdfs/tools/DFSck.java | 32 +-
.../org/apache/hadoop/hdfs/util/RwLock.java | 9 -
.../hadoop-hdfs/src/site/apt/Federation.apt.vm | 158 +++----
.../src/site/apt/HDFSCommands.apt.vm | 471 +++++++++++++++----
.../site/apt/HDFSHighAvailabilityWithNFS.apt.vm | 70 +--
.../site/apt/HDFSHighAvailabilityWithQJM.apt.vm | 40 +-
.../src/site/apt/HdfsNfsGateway.apt.vm | 108 ++---
.../hadoop/fs/TestEnhancedByteBufferAccess.java | 66 +--
.../server/datanode/SimulatedFSDataset.java | 4 +-
.../TestBlockHasMultipleReplicasOnSameDN.java | 2 +-
.../server/namenode/NNThroughputBenchmark.java | 2 +-
.../server/namenode/TestCacheDirectives.java | 3 +-
.../namenode/TestFsckWithMultipleNameNodes.java | 141 ++++++
hadoop-mapreduce-project/CHANGES.txt | 3 +
.../v2/app/rm/RMContainerAllocator.java | 2 +-
.../org/apache/hadoop/fs/s3a/Constants.java | 5 +-
.../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 19 +
.../hadoop/fs/s3a/TestS3AConfiguration.java | 85 ++++
hadoop-yarn-project/CHANGES.txt | 21 +
.../dev-support/findbugs-exclude.xml | 1 +
.../hadoop/yarn/conf/YarnConfiguration.java | 30 +-
.../yarn/client/api/SharedCacheClient.java | 108 +++++
.../client/api/impl/SharedCacheClientImpl.java | 166 +++++++
.../api/impl/TestSharedCacheClientImpl.java | 170 +++++++
.../src/main/resources/yarn-default.xml | 2 +-
.../client/impl/zk/RegistrySecurity.java | 13 +-
...lineDelegationTokenSecretManagerService.java | 12 +-
.../nodemanager/TestNodeManagerResync.java | 1 +
.../resourcemanager/RMActiveServiceContext.java | 4 +-
.../server/resourcemanager/RMContextImpl.java | 32 +-
.../resourcemanager/RMSecretManagerService.java | 12 +-
.../server/resourcemanager/rmapp/RMApp.java | 3 +
.../server/resourcemanager/rmapp/RMAppImpl.java | 5 +
.../scheduler/capacity/CSQueueUtils.java | 24 -
.../scheduler/capacity/LeafQueue.java | 252 ++++++----
.../scheduler/common/fica/FiCaSchedulerApp.java | 15 +
.../webapp/CapacitySchedulerPage.java | 4 +-
.../dao/CapacitySchedulerLeafQueueInfo.java | 24 +-
.../TestContainerResourceUsage.java | 3 +-
.../server/resourcemanager/TestRMRestart.java | 3 +-
.../applicationsmanager/MockAsm.java | 7 +
.../TestAMRMRPCNodeUpdates.java | 9 +
.../applicationsmanager/TestAMRestart.java | 6 +
.../TestCapacitySchedulerPlanFollower.java | 1 +
.../server/resourcemanager/rmapp/MockRMApp.java | 7 +
.../capacity/TestApplicationLimits.java | 256 ++++++----
.../scheduler/capacity/TestLeafQueue.java | 79 ++--
.../scheduler/capacity/TestReservations.java | 34 +-
.../scheduler/fifo/TestFifoScheduler.java | 23 +-
.../webapp/TestRMWebServicesCapacitySched.java | 12 -
.../src/site/apt/ResourceManagerHA.apt.vm | 1 +
.../src/site/apt/YarnCommands.apt.vm | 52 +-
83 files changed, 2782 insertions(+), 1316 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/630f1cd4/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------