Author: suresh
Date: Fri May 24 00:51:31 2013
New Revision: 1485911
URL: http://svn.apache.org/r1485911
Log:
HADOOP-8562. Merge r1457069 for HDFS-4604, r1459514 for YARN-488, r1459520 for
YARN-490, r1459526 for YARN-491, r1459544 for MAPREDUCE-5078 and r1459573 for
HDFS-4607
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1485911&r1=1485910&r2=1485911&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Fri
May 24 00:51:31 2013
@@ -210,6 +210,9 @@ Release 2.0.5-beta - UNRELEASED
MAPREDUCE-4898. FileOutputFormat.checkOutputSpecs and
FileOutputFormat.setOutputPath incompatible with MR1. (rkanter via tucu)
+
+ MAPREDUCE-5078. TestMRAppMaster fails on Windows due to mismatched path
+ separators. (Chris Nauroth via sseth)
MAPREDUCE-4932. mapreduce.job#getTaskCompletionEvents incompatible with
Hadoop 1. (rkanter via tucu)
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java?rev=1485911&r1=1485910&r2=1485911&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java
Fri May 24 00:51:31 2013
@@ -116,8 +116,10 @@ public class TestMRAppMaster {
JobConf conf = new JobConf();
conf.set(MRJobConfig.MR_AM_STAGING_DIR, stagingDir);
MRAppMaster.initAndStartAppMaster(appMaster, conf, userName);
- assertEquals(stagingDir + Path.SEPARATOR + userName + Path.SEPARATOR
- + ".staging", appMaster.stagingDirPath.toString());
+ Path userPath = new Path(stagingDir, userName);
+ Path userStagingPath = new Path(userPath, ".staging");
+ assertEquals(userStagingPath.toString(),
+ appMaster.stagingDirPath.toString());
}
@Test
