YARN-1357. Merging change r1537296 from branch-2 to branch-2.2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.2@1537298 13f79535-47bb-0310-9956-ffa450edef68

hadoop-yarn-project/CHANGES.txt

@@ -61,6 +61,9 @@ Release 2.2.1 - UNRELEASED
     
     YARN-1349. yarn.cmd does not support passthrough to any arbitrary class.
     (cnauroth)
+    
+    YARN-1357. TestContainerLaunch.testContainerEnvVariables fails on Windows.
+    (Chuan Liu via cnauroth)
 
 Release 2.2.0 - 2013-10-13
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java

@@ -388,8 +388,8 @@ public class TestContainerLaunch extends BaseContainerManagerTest {
           + processStartFile);
       for (String serviceName : containerManager.getAuxServiceMetaData()
           .keySet()) {
-        fileWriter.println("@echo" + AuxiliaryServiceHelper.NM_AUX_SERVICE
-            + serviceName + " >> "
+        fileWriter.println("@echo %" + AuxiliaryServiceHelper.NM_AUX_SERVICE
+            + serviceName + "%>> "
             + processStartFile);
       }
       fileWriter.println("@echo " + cId + ">> " + processStartFile);