Author: hitesh
Date: Wed Mar 6 19:29:12 2013
New Revision: 1453502
URL: http://svn.apache.org/r1453502
Log:
merge -c 1453501 from trunk to branch-2 to fix YARN-429. capacity-scheduler
config missing from yarn-test artifact. Contributed by Siddharth Seth.
Added:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/resources/capacity-scheduler.xml
- copied unchanged from r1453501,
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/resources/capacity-scheduler.xml
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1453502&r1=1453501&r2=1453502&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Wed Mar 6
19:29:12 2013
@@ -43,6 +43,9 @@ Release 2.0.4-beta - UNRELEASED
YARN-376. Fixes a bug which would prevent the NM knowing about completed
containers and applications. (Jason Lowe via sseth)
+ YARN-429. capacity-scheduler config missing from yarn-test artifact.
+ (sseth via hitesh)
+
Release 2.0.3-alpha - 2013-02-06
INCOMPATIBLE CHANGES
