Return-Path: 
 <common-commits-return-20143-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org>
X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org
Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B3801DC17
	for <apmail-hadoop-common-commits-archive@www.apache.org>;
 Thu,  3 Jan 2013 21:24:23 +0000 (UTC)
Received: (qmail 4715 invoked by uid 500); 3 Jan 2013 21:24:23 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 4581 invoked by uid 500); 3 Jan 2013 21:24:23 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Reply-To: common-dev@hadoop.apache.org
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 4573 invoked by uid 99); 3 Jan 2013 21:24:23 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jan 2013 21:24:23 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jan 2013 21:24:22 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 9ABBB2388847
	for <common-commits@hadoop.apache.org>; Thu,  3 Jan 2013 21:24:02 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1428601 - in /hadoop/common/branches/branch-trunk-win:
 ./
 hadoop-project/src/site/site.xml hadoop-tools/hadoop-streaming/pom.xml
 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
Date: Thu, 03 Jan 2013 21:24:02 -0000
To: common-commits@hadoop.apache.org
From: suresh@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130103212402.9ABBB2388847@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: suresh
Date: Thu Jan  3 21:23:58 2013
New Revision: 1428601

URL: http://svn.apache.org/viewvc?rev=1428601&view=rev
Log:
Merging trunk changes to branch-trunk-win

Modified:
    hadoop/common/branches/branch-trunk-win/   (props changed)
    hadoop/common/branches/branch-trunk-win/hadoop-project/src/site/site.xml
    hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-streaming/pom.xml
    hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java

Propchange: hadoop/common/branches/branch-trunk-win/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1423068-1428155

Modified: hadoop/common/branches/branch-trunk-win/hadoop-project/src/site/site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-project/src/site/site.xml?rev=1428601&r1=1428600&r2=1428601&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-project/src/site/site.xml Thu Jan  3 21:23:58 2013
@@ -51,6 +51,8 @@
       <item name="Single Node Setup" href="hadoop-project-dist/hadoop-common/SingleCluster.html"/>
       <item name="Cluster Setup" href="hadoop-project-dist/hadoop-common/ClusterSetup.html"/>
       <item name="CLI Mini Cluster" href="hadoop-project-dist/hadoop-common/CLIMiniCluster.html"/>
+      <item name="File System Shell" href="hadoop-project-dist/hadoop-common/FileSystemShell.html"/>
+      <item name="Hadoop Commands Reference" href="hadoop-project-dist/hadoop-common/CommandsManual.html"/>
     </menu>
     
     <menu name="HDFS" inherit="top">

Modified: hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-streaming/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-streaming/pom.xml?rev=1428601&r1=1428600&r2=1428601&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-streaming/pom.xml (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-streaming/pom.xml Thu Jan  3 21:23:58 2013
@@ -141,5 +141,14 @@
         </configuration>
        </plugin>
     </plugins>
+    <testResources>
+      <testResource>
+        <directory>${basedir}/../../hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/conf</directory>
+        <includes>
+          <include>capacity-scheduler.xml</include>
+        </includes>
+        <filtering>false</filtering>
+      </testResource>
+    </testResources>
   </build>
 </project>

Modified: hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java?rev=1428601&r1=1428600&r2=1428601&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java Thu Jan  3 21:23:58 2013
@@ -306,7 +306,13 @@ public class StreamJob implements Tool {
             throw new IllegalArgumentException(e);
           }
         }
-        config_.set("tmpfiles", config_.get("tmpfiles", "") + fileList);
+        String tmpFiles = config_.get("tmpfiles", "");
+        if (tmpFiles.isEmpty()) {
+          tmpFiles = fileList.toString();
+        } else {
+          tmpFiles = tmpFiles + "," + fileList;
+        }
+        config_.set("tmpfiles", tmpFiles);
         validate(packageFiles_);
       }