/[Apache-SVN]

Revision 1311521

Jump to revision:
Author:	tomwhite
Date:	Mon Apr 9 23:35:21 2012 UTC (12 years, 6 months ago)
Changed paths:	4
Log Message:	Merge -r 1311519:1311520 from trunk to branch-2. Fixes MAPREDUCE-4105.

Changed paths

Path	Details
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt	modified , text changed
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/RackResolver.java	modified , text changed
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestRackResolver.java	modified , text changed
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestRackResolverScriptBasedMapping.java (Copied from hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestRackResolverScriptBasedMapping.java, r1311520)	added

infrastructure at apache.org	ViewVC Help
Powered by ViewVC 1.1.26