Return-Path: 
 <common-commits-return-19680-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 EA0B2D806
	for <apmail-hadoop-common-commits-archive@www.apache.org>;
 Thu,  8 Nov 2012 19:10:20 +0000 (UTC)
Received: (qmail 71790 invoked by uid 500); 8 Nov 2012 19:10:20 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 71703 invoked by uid 500); 8 Nov 2012 19:10:20 -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 71694 invoked by uid 99); 8 Nov 2012 19:10:19 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Nov 2012 19:10:19 +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; Thu, 08 Nov 2012 19:10:17 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 9CBE423889C5
	for <common-commits@hadoop.apache.org>; Thu,  8 Nov 2012 19:09:56 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1407217 - in /hadoop/common/branches/branch-trunk-win:
 ./
 hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
Date: Thu, 08 Nov 2012 19:09:56 -0000
To: common-commits@hadoop.apache.org
From: suresh@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121108190956.9CBE423889C5@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: suresh
Date: Thu Nov  8 19:09:46 2012
New Revision: 1407217

URL: http://svn.apache.org/viewvc?rev=1407217&view=rev
Log:
Merging trunk to branch-trunk-win branch

Modified:
    hadoop/common/branches/branch-trunk-win/   (props changed)
    hadoop/common/branches/branch-trunk-win/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml

Propchange: hadoop/common/branches/branch-trunk-win/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1401063-1407201

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=1407217&r1=1407216&r2=1407217&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 Thu Nov  8 19:09:46 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>