Return-Path: 
 <common-commits-return-16850-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 4B07A991E
	for <apmail-hadoop-common-commits-archive@www.apache.org>;
 Mon,  6 Feb 2012 23:13:41 +0000 (UTC)
Received: (qmail 52377 invoked by uid 500); 6 Feb 2012 23:13:41 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 52202 invoked by uid 500); 6 Feb 2012 23:13:40 -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 52194 invoked by uid 99); 6 Feb 2012 23:13:40 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Feb 2012 23:13:40 +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; Mon, 06 Feb 2012 23:13:37 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 289D72388860
	for <common-commits@hadoop.apache.org>; Mon,  6 Feb 2012 23:13:17 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1241252 -
 /hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
Date: Mon, 06 Feb 2012 23:13:17 -0000
To: common-commits@hadoop.apache.org
From: acmurthy@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120206231317.289D72388860@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>