Author: acmurthy
Date: Mon Feb 6 23:13:16 2012
New Revision: 1241252
URL: http://svn.apache.org/viewvc?rev=1241252&view=rev
Log:
Merge -c 1241250 from trunk to branch-0.23 to fix MAPREDUCE-3354. Changed
scripts so that jobhistory server is started by bin/mapred instead of bin/yarn.
Contributed by Jonathan Eagles.
Modified:
hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
Modified:
hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml?rev=1241252&r1=1241251&r2=1241252&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
Mon Feb 6 23:13:16 2012
@@ -72,6 +72,14 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
+ <directory>bin</directory>
+ <outputDirectory>sbin</outputDirectory>
+ <includes>
+ <include>mr-jobhistory-daemon.sh</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
<directory>hadoop-yarn/conf</directory>
<outputDirectory>etc/hadoop</outputDirectory>
<includes>
