Merge 1529370 from branch-2 to branch-2.1-beta for YARN-1251. TestDistributedShell#TestDSShell failed with timeout. Contributed by Xuan Gong.

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

hadoop-yarn-project/CHANGES.txt

@@ -101,6 +101,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

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java

@@ -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);