hadoop/hadoop-yarn-project/hadoop-yarn/conf
Vinod Kumar Vavilapalli e49fb14997 YARN-181. Fixed eclipse settings broken by capacity-scheduler.xml move via YARN-140. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1401504 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401508 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 22:49:37 +00:00
..
container-executor.cfg Merge -c 1370666 from trunk to branch-2 to fix YARN-1. Promote YARN to be a sub-project of Apache Hadoop. 2012-08-08 05:33:56 +00:00
slaves Merge -c 1370666 from trunk to branch-2 to fix YARN-1. Promote YARN to be a sub-project of Apache Hadoop. 2012-08-08 05:33:56 +00:00
yarn-env.sh Merge -c 1390218 from trunk to branch-2 to fix YARN-9. Rename YARN_HOME to HADOOP_YARN_HOME. Contributed by Vinod K V. 2012-09-25 23:40:14 +00:00
yarn-site.xml Merge -c 1370666 from trunk to branch-2 to fix YARN-1. Promote YARN to be a sub-project of Apache Hadoop. 2012-08-08 05:33:56 +00:00