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 2014/10/01 18:05:58 UTC

[07/50] [abbrv] git commit: Merge branch 'trunk' into HDFS-6581

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/900f6e52
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/900f6e52
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/900f6e52

Branch: refs/heads/trunk
Commit: 900f6e52ec33ca82edb0d306d0bfecc1ba4d60e6
Parents: a186d51 f488611
Author: arp <ar...@apache.org>
Authored: Wed Sep 17 15:19:43 2014 -0700
Committer: arp <ar...@apache.org>
Committed: Wed Sep 17 15:19:43 2014 -0700

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                 |  3 +
 .../yarn/security/ContainerTokenIdentifier.java |  4 +-
 .../server/TestContainerManagerSecurity.java    | 92 ++++++++++++++++++++
 3 files changed, 97 insertions(+), 2 deletions(-)
----------------------------------------------------------------------