hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aengin...@apache.org
Subject [27/27] hadoop git commit: Merge branch 'trunk' into HDFS-7240
Date Tue, 19 Apr 2016 00:20:27 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/c884170c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c884170c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c884170c

Branch: refs/heads/HDFS-7240
Commit: c884170c9338534229a0872087ae64fc9db70b05
Parents: ce524c5 cb3ca46
Author: Anu Engineer <aengineer@apache.org>
Authored: Mon Apr 18 16:58:45 2016 -0700
Committer: Anu Engineer <aengineer@apache.org>
Committed: Mon Apr 18 16:58:45 2016 -0700

----------------------------------------------------------------------
 .../client/KerberosAuthenticator.java           |   6 +-
 .../main/java/org/apache/hadoop/ipc/Client.java |   3 +-
 .../main/java/org/apache/hadoop/ipc/Server.java |   5 +-
 .../src/main/resources/core-default.xml         |   7 +
 .../kms/TestLoadBalancingKMSClientProvider.java |   8 +-
 .../apache/hadoop/fs/shell/find/TestAnd.java    |  25 +-
 .../fs/shell/find/TestFilterExpression.java     |  27 +-
 .../apache/hadoop/fs/shell/find/TestFind.java   |   3 +-
 .../apache/hadoop/fs/shell/find/TestIname.java  |  17 +-
 .../apache/hadoop/fs/shell/find/TestName.java   |  17 +-
 .../apache/hadoop/fs/shell/find/TestPrint.java  |   9 +-
 .../apache/hadoop/fs/shell/find/TestPrint0.java |   9 +-
 .../apache/hadoop/fs/shell/find/TestResult.java |  41 +-
 .../hadoop-kms/src/main/conf/kms-env.sh         |   2 +-
 .../hadoop-kms/src/main/libexec/kms-config.sh   |   2 +-
 .../hadoop-kms/src/site/markdown/index.md.vm    |   4 +-
 .../org/apache/hadoop/hdfs/DFSOutputStream.java |   2 +-
 .../server/blockmanagement/BlockManager.java    |  17 +
 .../BlockPlacementPolicyDefault.java            |   3 +-
 .../hdfs/server/datanode/DirectoryScanner.java  |  14 +-
 .../hdfs/server/datanode/VolumeScanner.java     |   2 +-
 .../datanode/fsdataset/impl/FsVolumeImpl.java   |  12 +
 .../hdfs/server/namenode/FSEditLogOp.java       |   3 +-
 .../org/apache/hadoop/hdfs/tools/DFSAdmin.java  |   4 +
 .../src/site/markdown/HDFSCommands.md           |   2 +
 .../org/apache/hadoop/hdfs/DFSTestUtil.java     |  12 +
 .../apache/hadoop/hdfs/StripedFileTestUtil.java |  21 +-
 .../org/apache/hadoop/hdfs/TestGetBlocks.java   |   8 +-
 .../server/datanode/FsDatasetTestUtils.java     |   7 +
 .../hdfs/server/datanode/TestBlockScanner.java  |  63 +++
 .../server/datanode/TestDataNodeMetrics.java    |   6 +-
 .../fsdataset/impl/FsDatasetImplTestUtils.java  |  21 +
 .../namenode/TestFSImageWithSnapshot.java       |  43 +-
 .../ha/TestPendingCorruptDnMessages.java        |  51 ++-
 .../apache/hadoop/hdfs/tools/TestDFSAdmin.java  |   2 +-
 .../jobhistory/JobHistoryEventHandler.java      |   9 +-
 .../v2/app/job/event/TaskAttemptKillEvent.java  |  15 +-
 .../app/job/event/TaskTAttemptKilledEvent.java  |  40 ++
 .../mapreduce/v2/app/job/impl/JobImpl.java      |   4 +-
 .../v2/app/job/impl/TaskAttemptImpl.java        |  48 +-
 .../mapreduce/v2/app/job/impl/TaskImpl.java     |  25 +-
 .../v2/app/rm/RMContainerAllocator.java         |   4 +-
 .../hadoop/mapreduce/v2/app/TestMRApp.java      |  51 ++-
 .../v2/app/job/impl/TestTaskAttempt.java        |  87 +++-
 .../mapreduce/v2/app/job/impl/TestTaskImpl.java |  75 +++-
 .../hadoop/mapreduce/v2/hs/CompletedJob.java    |   9 +-
 .../mapreduce/v2/hs/TestJobHistoryEntities.java |  27 ++
 hadoop-project/src/site/site.xml                |   1 +
 .../org/apache/hadoop/fs/s3a/Constants.java     |  10 +-
 .../org/apache/hadoop/fs/s3a/S3AFileSystem.java |  10 +
 .../src/site/markdown/tools/hadoop-aws/index.md |   7 +
 .../hadoop/fs/s3a/TestS3AConfiguration.java     |  47 +-
 .../apache/hadoop/tools/SimpleCopyListing.java  |   2 +-
 .../org/apache/hadoop/tools/TestDistCpSync.java |  38 ++
 .../pom.xml                                     |   6 +
 .../distributedshell/ApplicationMaster.java     |  10 +-
 .../distributedshell/TestDistributedShell.java  |  50 +++
 .../client/api/impl/TimelineClientImpl.java     |  74 ++-
 .../client/api/impl/TestTimelineClient.java     |  43 +-
 .../hadoop/yarn/webapp/JerseyTestBase.java      |  18 +-
 .../containermanager/ContainerManagerImpl.java  |  17 -
 .../recovery/NMLeveldbStateStoreService.java    |  80 ++--
 .../recovery/NMNullStateStoreService.java       |   4 -
 .../recovery/NMStateStoreService.java           |  12 -
 .../TestContainerManagerRecovery.java           |   4 +
 .../recovery/NMMemoryStateStoreService.java     |  10 -
 .../TestNMLeveldbStateStoreService.java         |  10 +-
 .../resourcemanager/NodesListManager.java       |  36 +-
 .../resourcemanager/rmnode/RMNodeImpl.java      |   4 +-
 .../scheduler/capacity/LeafQueue.java           |   7 -
 .../scheduler/common/fica/FiCaSchedulerApp.java |   2 +
 .../resourcemanager/TestClientRMService.java    |  49 +-
 .../resourcemanager/TestRMNodeTransitions.java  |   4 +-
 .../capacity/TestContainerAllocation.java       | 188 +++++++-
 .../src/site/markdown/ReservationSystem.md      |  65 +++
 .../src/site/markdown/ResourceManagerRest.md    | 447 ++++++++++++++++++-
 .../hadoop-yarn-site/src/site/markdown/YARN.md  |   2 +
 .../images/yarn_reservation_system.png          | Bin 0 -> 85449 bytes
 78 files changed, 1771 insertions(+), 358 deletions(-)
----------------------------------------------------------------------



Mime
View raw message