Author: suresh
Date: Mon Nov 12 19:52:13 2012
New Revision: 1408425
URL: http://svn.apache.org/viewvc?rev=1408425&view=rev
Log:
HADOOP-9005. Merge hadoop cmd line scripts from branch-1-win. Contributed by
Ivan Mitic.
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
hadoop/common/branches/branch-trunk-win/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml?rev=1408425&r1=1408424&r2=1408425&view=diff
==============================================================================
---
hadoop/common/branches/branch-trunk-win/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
(original)
+++
hadoop/common/branches/branch-trunk-win/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Mon Nov 12 19:52:13 2012
@@ -26,6 +26,9 @@
<outputDirectory>/bin</outputDirectory>
<excludes>
<exclude>*.sh</exclude>
+ <exclude>*-config.cmd</exclude>
+ <exclude>start-*.cmd</exclude>
+ <exclude>stop-*.cmd</exclude>
</excludes>
<fileMode>0755</fileMode>
</fileSet>
@@ -38,6 +41,7 @@
<outputDirectory>/libexec</outputDirectory>
<includes>
<include>*-config.sh</include>
+ <include>*-config.cmd</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
@@ -46,9 +50,13 @@
<outputDirectory>/sbin</outputDirectory>
<includes>
<include>*.sh</include>
+ <include>*.cmd</include>
</includes>
<excludes>
<exclude>hadoop-config.sh</exclude>
+ <exclude>hadoop.cmd</exclude>
+ <exclude>hdfs.cmd</exclude>
+ <exclude>hadoop-config.cmd</exclude>
</excludes>
<fileMode>0755</fileMode>
</fileSet>
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml?rev=1408425&r1=1408424&r2=1408425&view=diff
==============================================================================
---
hadoop/common/branches/branch-trunk-win/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
(original)
+++
hadoop/common/branches/branch-trunk-win/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
Mon Nov 12 19:52:13 2012
@@ -33,6 +33,7 @@
<outputDirectory>bin</outputDirectory>
<includes>
<include>yarn</include>
+ <include>yarn.cmd</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
@@ -41,6 +42,7 @@
<outputDirectory>libexec</outputDirectory>
<includes>
<include>yarn-config.sh</include>
+ <include>yarn-config.cmd</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
@@ -52,6 +54,8 @@
<include>yarn-daemons.sh</include>
<include>start-yarn.sh</include>
<include>stop-yarn.sh</include>
+ <include>start-yarn.cmd</include>
+ <include>stop-yarn.cmd</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
