svn commit: r1538040 - in /hadoop/common/branches/branch-2.2/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRAMWithNonNormalizedCapabilities.java

[cnauroth]

Author: cnauroth
Date: Fri Nov  1 19:24:04 2013
New Revision: 1538040

URL: http://svn.apache.org/r1538040
Log:
MAPREDUCE-5604. Merging change r1538038 from branch-2 to branch-2.2

Modified:
    hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/CHANGES.txt
    
hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRAMWithNonNormalizedCapabilities.java

Modified: hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/CHANGES.txt?rev=1538040&r1=1538039&r2=1538040&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/CHANGES.txt Fri 
Nov  1 19:24:04 2013
@@ -43,6 +43,9 @@ Release 2.2.1 - UNRELEASED
     MAPREDUCE-5598. TestUserDefinedCounters.testMapReduceJob is flakey
     (Robert Kanter via jlowe)
 
+    MAPREDUCE-5604. TestMRAMWithNonNormalizedCapabilities fails on Windows due 
to
+    exceeding max path length. (cnauroth)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRAMWithNonNormalizedCapabilities.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRAMWithNonNormalizedCapabilities.java?rev=1538040&r1=1538039&r2=1538040&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRAMWithNonNormalizedCapabilities.java
 (original)
+++ 
hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRAMWithNonNormalizedCapabilities.java
 Fri Nov  1 19:24:04 2013
@@ -67,7 +67,7 @@ public class TestMRAMWithNonNormalizedCa
     }
 
     if (mrCluster == null) {
-      mrCluster = new MiniMRYarnCluster(getClass().getName());
+      mrCluster = new MiniMRYarnCluster(getClass().getSimpleName());
       mrCluster.init(new Configuration());
       mrCluster.start();
     }