hadoop-common-commits mailing list archives

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



Mime
View raw message