svn commit: r1529370 - in /hadoop/common/branches/branch-2/hadoop-yarn-project: ./ hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/

[hitesh]

Author: hitesh
Date: Sat Oct  5 00:48:56 2013
New Revision: 1529370

URL: http://svn.apache.org/r1529370
Log:
Merge 1529369 from trunk to branch-2 for YARN-1251. 
TestDistributedShell#TestDSShell failed with timeout. Contributed by Xuan Gong.

Modified:
    hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
    
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java

Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1529370&r1=1529369&r2=1529370&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Sat Oct  5 
00:48:56 2013
@@ -150,6 +150,9 @@ Release 2.1.2 - UNRELEASED
     YARN-1219. FSDownload changes file suffix making FileUtil.unTar() throw
     exception. (Shanyu Zhao via cnauroth)
 
+    YARN-1251. TestDistributedShell#TestDSShell failed with timeout. (Xuan Gong
+    via hitesh)
+
 Release 2.1.1-beta - 2013-09-23
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java?rev=1529370&r1=1529369&r2=1529370&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
 Sat Oct  5 00:48:56 2013
@@ -834,7 +834,7 @@ public class ApplicationMaster {
       // files in the distributed file-system. The tokens are otherwise also
       // useful in cases, for e.g., when one is running a "hadoop dfs" command
       // inside the distributed shell.
-      ctx.setTokens(allTokens);
+      ctx.setTokens(allTokens.duplicate());
 
       containerListener.addContainer(container.getId(), container);
       nmClientAsync.startContainerAsync(container, ctx);