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 aw...@apache.org on 2015/07/20 18:42:24 UTC
[16/17] hadoop git commit: Merge branch 'trunk' into HADOOP-12111
Merge branch 'trunk' into HADOOP-12111
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fbe6a692
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fbe6a692
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fbe6a692
Branch: refs/heads/HADOOP-12111
Commit: fbe6a692fd4a8229491c0718407d06ecbd249665
Parents: 840e0e5 98c2bc8
Author: Allen Wittenauer <aw...@apache.org>
Authored: Mon Jul 20 09:39:55 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Mon Jul 20 09:39:55 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 20 +++++
.../hadoop-common/src/main/bin/hadoop | 52 +++++------
.../src/main/bin/hadoop-functions.sh | 90 ++++++++++++++++++++
.../crypto/key/kms/KMSClientProvider.java | 4 +-
.../java/org/apache/hadoop/fs/FileStatus.java | 15 ++--
.../org/apache/hadoop/fs/LocatedFileStatus.java | 10 +--
.../apache/hadoop/fs/RawLocalFileSystem.java | 53 ++++++------
.../fs/viewfs/ViewFsLocatedFileStatus.java | 3 +-
.../apache/hadoop/ipc/ProtobufRpcEngine.java | 2 +-
.../hadoop/security/token/SecretManager.java | 2 +-
.../org/apache/hadoop/security/token/Token.java | 2 +-
.../hadoop/security/token/TokenIdentifier.java | 2 +-
.../apache/hadoop/security/token/TokenInfo.java | 2 +-
.../hadoop/security/token/TokenRenewer.java | 2 +-
.../hadoop/security/token/TokenSelector.java | 2 +-
.../hadoop/security/token/package-info.java | 2 +-
.../org/apache/hadoop/fs/TestFileStatus.java | 22 +++++
.../apache/hadoop/fs/TestLocalFileSystem.java | 22 +++++
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +
.../hadoop-hdfs/src/main/bin/hdfs | 82 ++++++++----------
.../java/org/apache/hadoop/hdfs/DFSClient.java | 16 +---
.../hadoop/hdfs/client/impl/LeaseRenewer.java | 12 ++-
.../hadoop/hdfs/TestDFSClientRetries.java | 66 +++++++++++++-
hadoop-mapreduce-project/bin/mapred | 33 +++----
hadoop-tools/hadoop-openstack/pom.xml | 4 +-
hadoop-yarn-project/CHANGES.txt | 15 ++++
hadoop-yarn-project/hadoop-yarn/bin/yarn | 54 +++++-------
.../nodelabels/FileSystemNodeLabelsStore.java | 39 +++++----
.../hadoop/yarn/server/webapp/AppBlock.java | 6 +-
.../container-executor/impl/configuration.c | 9 +-
.../impl/container-executor.c | 20 +++--
.../impl/container-executor.h | 4 +-
.../test/test-container-executor.c | 32 +++----
.../ProportionalCapacityPreemptionPolicy.java | 8 +-
.../rmcontainer/RMContainerImpl.java | 14 ++-
.../scheduler/capacity/CapacityScheduler.java | 10 ++-
.../event/ContainerRescheduledEvent.java | 35 ++++++++
.../scheduler/event/SchedulerEventType.java | 3 +
.../scheduler/fair/FairScheduler.java | 11 ++-
.../scheduler/fifo/FifoScheduler.java | 9 ++
.../applicationsmanager/TestAMRestart.java | 2 +-
...estProportionalCapacityPreemptionPolicy.java | 32 +++++++
.../scheduler/TestAbstractYarnScheduler.java | 90 ++++++++++++++++++++
.../scheduler/fair/TestFairScheduler.java | 4 +
44 files changed, 667 insertions(+), 253 deletions(-)
----------------------------------------------------------------------