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:06:40 UTC

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

Branch: refs/heads/trunk
Commit: e431d054cb545bdf0ddc5f486aea69bcb32012db
Parents: a45ad33 3f25d91
Author: arp <ar...@apache.org>
Authored: Wed Oct 1 08:52:21 2014 -0700
Committer: arp <ar...@apache.org>
Committed: Wed Oct 1 08:52:21 2014 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |   3 +
 .../namenode/TestNamenodeCapacityReport.java    |   4 +-
 hadoop-yarn-project/CHANGES.txt                 |   3 +
 hadoop-yarn-project/hadoop-yarn/bin/yarn        |   6 ++
 .../hadoop/yarn/conf/YarnConfiguration.java     |  22 ++++
 .../src/main/resources/yarn-default.xml         |  20 ++++
 .../sharedcache/SharedCacheStructureUtil.java   |  81 ++++++++++++++
 .../pom.xml                                     |  90 ++++++++++++++++
 .../server/sharedcachemanager/AppChecker.java   |  65 +++++++++++
 .../sharedcachemanager/RemoteAppChecker.java    | 102 ++++++++++++++++++
 .../sharedcachemanager/SharedCacheManager.java  |  86 +++++++++++++++
 .../TestRemoteAppChecker.java                   | 107 +++++++++++++++++++
 .../hadoop-yarn/hadoop-yarn-server/pom.xml      |   1 +
 13 files changed, 588 insertions(+), 2 deletions(-)
----------------------------------------------------------------------