Merge branch 'trunk' into HDFS-6581
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bfc7b7e6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bfc7b7e6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bfc7b7e6 Branch: refs/heads/HDFS-6581 Commit: bfc7b7e6a03fd875b3660950287b156fbacaf589 Parents: 8b139b0 b93d960 Author: arp <a...@apache.org> Authored: Tue Sep 23 16:40:35 2014 -0700 Committer: arp <a...@apache.org> Committed: Tue Sep 23 16:40:35 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 5 + .../hadoop-common/src/main/bin/hadoop | 6 +- .../src/main/bin/hadoop-functions.sh | 11 ++ .../java/org/apache/hadoop/minikdc/MiniKdc.java | 33 +++-- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 9 ++ .../hadoop-hdfs/src/main/bin/hdfs | 6 +- .../hadoop/hdfs/server/namenode/NameNode.java | 3 + .../hadoop/hdfs/TestDataTransferKeepalive.java | 4 +- .../hadoop/hdfs/TestEncryptionZonesWithHA.java | 3 +- .../namenode/TestMetadataVersionOutput.java | 32 +++-- hadoop-mapreduce-project/bin/mapred | 7 +- hadoop-yarn-project/CHANGES.txt | 13 ++ hadoop-yarn-project/hadoop-yarn/bin/yarn | 6 +- .../records/ApplicationSubmissionContext.java | 36 +++++ .../yarn/api/records/LogAggregationContext.java | 121 +++++++++++++++++ .../src/main/proto/yarn_protos.proto | 7 + .../pb/ApplicationSubmissionContextPBImpl.java | 40 ++++++ .../impl/pb/LogAggregationContextPBImpl.java | 134 +++++++++++++++++++ .../hadoop/yarn/api/TestPBImplRecords.java | 1 + .../nodemanager/NodeStatusUpdaterImpl.java | 2 +- .../scheduler/fair/FSAppAttempt.java | 27 ++++ .../scheduler/fair/SchedulingPolicy.java | 15 +++ .../DominantResourceFairnessPolicy.java | 17 ++- .../fair/policies/FairSharePolicy.java | 11 ++ .../scheduler/fair/policies/FifoPolicy.java | 12 ++ .../scheduler/fair/TestFSAppAttempt.java | 63 +++++++++ .../scheduler/fair/TestFairScheduler.java | 72 +++++----- .../server/TestContainerManagerSecurity.java | 28 ++-- 28 files changed, 643 insertions(+), 81 deletions(-) ----------------------------------------------------------------------
