hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [4/4] git commit: Merge branch 'trunk' into HDFS-6581
Date Sun, 28 Sep 2014 03:28:56 GMT
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/9cbb2c55
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9cbb2c55
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9cbb2c55

Branch: refs/heads/HDFS-6581
Commit: 9cbb2c55d586e104fd988814ef4244c13468546e
Parents: d963966 7f300bc
Author: arp <arp@apache.org>
Authored: Sat Sep 27 20:28:03 2014 -0700
Committer: arp <arp@apache.org>
Committed: Sat Sep 27 20:28:03 2014 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt |   3 +
 .../java/org/apache/hadoop/net/NetUtils.java    |   2 +-
 .../src/site/apt/DeprecatedProperties.apt.vm    |   2 +
 hadoop-mapreduce-project/CHANGES.txt            |   4 +
 .../apache/hadoop/mapreduce/MRJobConfig.java    |   2 +-
 .../hadoop/mapreduce/util/ConfigUtil.java       |   2 +
 hadoop-yarn-project/CHANGES.txt                 |   3 +
 .../hadoop-yarn/hadoop-yarn-client/pom.xml      |  35 ++++
 .../api/impl/AMRMTokenIdentifierForTest.java    | 130 +++++++++++++
 .../yarn/client/api/impl/TestAMRMClient.java    |  39 +++-
 .../src/test/proto/test_amrm_token.proto        |  31 +++
 .../hadoop-yarn/hadoop-yarn-common/pom.xml      |  24 +++
 .../yarn/security/AMRMTokenIdentifier.java      |  86 +++++---
 .../yarn/security/ContainerTokenIdentifier.java | 170 ++++++++--------
 .../hadoop/yarn/security/NMTokenIdentifier.java |  97 ++++++---
 .../main/proto/server/yarn_security_token.proto |  53 +++++
 .../yarn/security/TestYARNTokenIdentifier.java  | 154 +++++++++++++++
 .../containermanager/ContainerManagerImpl.java  |  10 +-
 .../container/TestContainer.java                |   4 +-
 .../TestApplicationMasterService.java           |   2 +-
 .../hadoop-yarn-server-tests/pom.xml            |  29 +++
 .../server/ContainerTokenIdentifierForTest.java | 195 +++++++++++++++++++
 .../server/NMTokenIdentifierNewForTest.java     | 145 ++++++++++++++
 .../server/TestContainerManagerSecurity.java    | 116 +++++++++--
 .../src/test/proto/test_token.proto             |  48 +++++
 25 files changed, 1218 insertions(+), 168 deletions(-)
----------------------------------------------------------------------



Mime
View raw message