hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject [29/64] [abbrv] git commit: Merge trunk into branch
Date Sat, 13 Sep 2014 01:41:34 GMT
Merge trunk into branch


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1613007 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/trunk
Commit: 5149a8a6f1d2fc673a7d011d7e0e1a5407ceac4c
Parents: b2cba48 2054453
Author: Todd Lipcon <todd@apache.org>
Authored: Thu Jul 24 06:23:41 2014 +0000
Committer: Todd Lipcon <todd@apache.org>
Committed: Thu Jul 24 06:23:41 2014 +0000

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt |  14 +
 .../apache/hadoop/fs/ChecksumFileSystem.java    |   4 +-
 .../java/org/apache/hadoop/fs/FileContext.java  |  29 ++
 .../java/org/apache/hadoop/fs/FileSystem.java   |   2 +-
 .../org/apache/hadoop/fs/viewfs/ChRootedFs.java |  34 ++
 .../apache/hadoop/fs/viewfs/ViewFileSystem.java |  34 ++
 .../org/apache/hadoop/fs/viewfs/ViewFs.java     |  80 +++++
 .../security/alias/JavaKeyStoreProvider.java    |   5 +-
 .../apache/hadoop/util/DirectBufferPool.java    | 109 ++++++
 .../org/apache/hadoop/fs/TestDFVariations.java  |  21 +-
 .../apache/hadoop/fs/shell/TestPathData.java    |  12 +-
 .../fs/viewfs/ViewFileSystemBaseTest.java       |  30 ++
 .../apache/hadoop/fs/viewfs/ViewFsBaseTest.java |  30 ++
 .../hadoop/util/TestDirectBufferPool.java       |  97 +++++
 .../java/org/apache/hadoop/nfs/NfsExports.java  |   7 +-
 .../hadoop/hdfs/nfs/mount/RpcProgramMountd.java |  19 +-
 .../hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java    |   5 +-
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |  10 +
 .../apache/hadoop/hdfs/BlockReaderLocal.java    |   2 +-
 .../hadoop/hdfs/BlockReaderLocalLegacy.java     |   2 +-
 .../hadoop/hdfs/protocol/ClientProtocol.java    |   2 +-
 .../protocol/datatransfer/PacketReceiver.java   |   2 +-
 .../server/datanode/BlockPoolSliceScanner.java  |  54 ++-
 .../hadoop/hdfs/server/namenode/FSEditLog.java  |   3 +-
 .../hdfs/server/namenode/FSEditLogLoader.java   |   4 +
 .../hdfs/server/namenode/FSEditLogOp.java       |   5 +
 .../hdfs/server/namenode/FSNamesystem.java      |  62 +++-
 .../server/namenode/XAttrPermissionFilter.java  |  17 +-
 .../hadoop/hdfs/util/DirectBufferPool.java      | 107 ------
 .../hdfs/web/resources/XAttrNameParam.java      |   4 +-
 .../org/apache/hadoop/hdfs/TestDFSShell.java    |  69 ++++
 .../hdfs/server/namenode/FSXAttrBaseTest.java   | 351 +++++++++++++++++--
 .../server/namenode/TestNamenodeRetryCache.java |   4 +-
 .../namenode/ha/TestRetryCacheWithHA.java       |  54 ++-
 .../hadoop/hdfs/util/TestDirectBufferPool.java  |  97 -----
 .../hadoop/hdfs/web/resources/TestParam.java    |   6 -
 .../hadoop-hdfs/src/test/resources/editsStored  | Bin 4970 -> 4992 bytes
 .../src/test/resources/editsStored.xml          |   2 +
 hadoop-yarn-project/CHANGES.txt                 |  12 +
 .../dev-support/findbugs-exclude.xml            |   6 +
 .../BaseContainerTokenSecretManager.java        |   2 +-
 .../yarn/server/nodemanager/NodeManager.java    |   6 +-
 .../recovery/NMLeveldbStateStoreService.java    | 117 ++++++-
 .../recovery/NMNullStateStoreService.java       |  30 +-
 .../recovery/NMStateStoreService.java           |  40 ++-
 .../security/NMContainerTokenSecretManager.java | 105 +++++-
 .../security/NMTokenSecretManagerInNM.java      |   5 +-
 .../recovery/NMMemoryStateStoreService.java     |  55 ++-
 .../TestNMLeveldbStateStoreService.java         |  96 ++++-
 .../TestNMContainerTokenSecretManager.java      | 144 ++++++++
 .../security/TestNMTokenSecretManagerInNM.java  |   8 +-
 .../scheduler/fair/FairScheduler.java           |  15 +-
 .../fair/FairSchedulerConfiguration.java        |   9 +
 .../security/DelegationTokenRenewer.java        |   6 +-
 .../fair/TestFairSchedulerPreemption.java       |   2 +-
 .../security/TestDelegationTokenRenewer.java    |  36 +-
 .../src/site/apt/FairScheduler.apt.vm           |   6 +
 .../src/site/apt/ResourceManagerRest.apt.vm     | 105 +++---
 58 files changed, 1789 insertions(+), 405 deletions(-)
----------------------------------------------------------------------



Mime
View raw message