Author: acmurthy
Date: Wed Jan 9 05:17:31 2013
New Revision: 1430683
URL: http://svn.apache.org/viewvc?rev=1430683&view=rev
Log:
Merge -c 1430682 from trunk to branch-2 to fix YARN-2. Enhanced
CapacityScheduler to account for CPU alongwith memory for multi-dimensional
resource scheduling. Contributed by Arun C. Murthy.
Modified:
hadoop/common/branches/branch-2/ (props changed)
hadoop/common/branches/branch-2/hadoop-project/ (props changed)
hadoop/common/branches/branch-2/hadoop-project/src/site/ (props changed)
Propchange: hadoop/common/branches/branch-2/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1430682
Propchange: hadoop/common/branches/branch-2/hadoop-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-project:r1430682
Propchange: hadoop/common/branches/branch-2/hadoop-project/src/site/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-project/src/site:r1430682
