Return-Path: 
 <common-commits-return-19582-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 2A542DD5F
	for <apmail-hadoop-common-commits-archive@www.apache.org>;
 Tue, 23 Oct 2012 22:50:22 +0000 (UTC)
Received: (qmail 14386 invoked by uid 500); 23 Oct 2012 22:50:21 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 14328 invoked by uid 500); 23 Oct 2012 22:50:21 -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 14320 invoked by uid 99); 23 Oct 2012 22:50:21 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Oct 2012 22:50:21 +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; Tue, 23 Oct 2012 22:50:20 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B0F852388A3D
	for <common-commits@hadoop.apache.org>; Tue, 23 Oct 2012 22:49:37 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1401508 -
 /hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
Date: Tue, 23 Oct 2012 22:49:37 -0000
To: common-commits@hadoop.apache.org
From: vinodkv@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121023224937.B0F852388A3D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: vinodkv
Date: Tue Oct 23 22:49:37 2012
New Revision: 1401508

URL: http://svn.apache.org/viewvc?rev=1401508&view=rev
Log:
YARN-181. Fixed eclipse settings broken by capacity-scheduler.xml move via YARN-140. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1401504 ../../trunk/

Modified:
    hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml

Modified: hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml?rev=1401508&r1=1401507&r2=1401508&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml Tue Oct 23 22:49:37 2012
@@ -63,6 +63,13 @@
       </includes>
     </fileSet>
     <fileSet>
+      <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/conf</directory>
+      <outputDirectory>etc/hadoop</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
       <directory>${basedir}</directory>
       <outputDirectory>/share/doc/hadoop/${hadoop.component}</outputDirectory>
       <includes>