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 2016/06/23 18:32:10 UTC
[10/11] hadoop git commit: Merge branch 'trunk' into HDFS-1312
Merge branch 'trunk' into HDFS-1312
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ea8bfc37
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ea8bfc37
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ea8bfc37
Branch: refs/heads/HDFS-1312
Commit: ea8bfc3704d174b31565441193d0b75bdef607c4
Parents: 7034dcf e98c0c7
Author: Arpit Agarwal <ar...@apache.org>
Authored: Thu Jun 23 11:31:10 2016 -0700
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Thu Jun 23 11:31:10 2016 -0700
----------------------------------------------------------------------
dev-support/docker/Dockerfile | 1 +
.../DelegationTokenAuthenticationHandler.java | 7 -
.../web/DelegationTokenAuthenticator.java | 19 --
.../delegation/web/TestWebDelegationToken.java | 114 +------
.../apache/hadoop/hdfs/FileChecksumHelper.java | 13 +-
.../datatransfer/DataTransferProtocol.java | 5 +-
.../hdfs/protocol/datatransfer/Sender.java | 4 +-
.../src/main/proto/datatransfer.proto | 1 +
.../hadoop-hdfs-native-client/pom.xml | 5 +
.../hdfs/protocol/datatransfer/Receiver.java | 3 +-
.../server/datanode/BlockChecksumHelper.java | 81 +++--
.../hdfs/server/datanode/DataXceiver.java | 5 +-
.../StripedBlockChecksumReconstructor.java | 69 ++++-
.../server/namenode/FSImageSerialization.java | 2 +-
.../apache/hadoop/hdfs/TestFileChecksum.java | 309 +++++++++++++++++--
.../v2/app/job/impl/TestTaskAttempt.java | 5 +-
.../apache/hadoop/yarn/client/cli/LogsCLI.java | 62 ++--
.../api/impl/TestDistributedScheduling.java | 123 +++++++-
.../hadoop/yarn/client/cli/TestLogsCLI.java | 24 +-
.../yarn/api/records/impl/pb/ProtoUtils.java | 14 +
.../yarn/logaggregation/LogCLIHelpers.java | 12 +-
.../api/DistributedSchedulerProtocol.java | 4 +-
...istributedSchedulerProtocolPBClientImpl.java | 17 +-
...stributedSchedulerProtocolPBServiceImpl.java | 7 +-
.../DistSchedAllocateRequest.java | 69 +++++
.../impl/pb/DistSchedAllocateRequestPBImpl.java | 185 +++++++++++
.../proto/distributed_scheduler_protocol.proto | 2 +-
.../yarn_server_common_service_protos.proto | 5 +
.../amrmproxy/AbstractRequestInterceptor.java | 12 +-
.../amrmproxy/DefaultRequestInterceptor.java | 11 +-
.../nodemanager/scheduler/LocalScheduler.java | 34 +-
.../scheduler/TestLocalScheduler.java | 3 +-
.../DistributedSchedulingService.java | 29 +-
.../rmcontainer/RMContainer.java | 11 +
.../rmcontainer/RMContainerImpl.java | 31 ++
.../scheduler/AbstractYarnScheduler.java | 18 +-
.../scheduler/SchedulerApplicationAttempt.java | 20 ++
.../TestDistributedSchedulingService.java | 24 +-
.../TestRMWebServicesForCSWithPartitions.java | 4 +-
39 files changed, 1061 insertions(+), 303 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org