Author: ddas
Date: Tue Sep 13 00:38:35 2011
New Revision: 1169988
URL: http://svn.apache.org/viewvc?rev=1169988&view=rev
Log:
Merge -r 1169985:1169986 from trunk onto 0.23
Modified:
hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Modified:
hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml?rev=1169988&r1=1169987&r2=1169988&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Tue Sep 13 00:38:35 2011
@@ -79,6 +79,13 @@
</includes>
</fileSet>
<fileSet>
+ <directory>${basedir}/src/main/packages/templates/conf</directory>
+
<outputDirectory>/share/hadoop/${hadoop.component}/templates/conf</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>${project.build.directory}</directory>
<outputDirectory>/share/hadoop/${hadoop.component}</outputDirectory>
<includes>
