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_);
}
