You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2013/07/08 22:30:09 UTC
svn commit: r1500932 -
/hadoop/common/branches/branch-2.1-beta/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
Author: cnauroth
Date: Mon Jul 8 20:30:08 2013
New Revision: 1500932
URL: http://svn.apache.org/r1500932
Log:
MAPREDUCE-5187. Merging change r1500930 from branch-2 to branch-2.1-beta.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml?rev=1500932&r1=1500931&r2=1500932&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml Mon Jul 8 20:30:08 2013
@@ -28,6 +28,7 @@
<outputDirectory>bin</outputDirectory>
<includes>
<include>mapred</include>
+ <include>mapred.cmd</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
@@ -36,6 +37,7 @@
<outputDirectory>libexec</outputDirectory>
<includes>
<include>mapred-config.sh</include>
+ <include>mapred-config.cmd</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>