hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vino...@apache.org
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 GMT
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>



Mime
View raw message