Author: tgraves
Date: Thu Jul 5 19:14:13 2012
New Revision: 1357813
URL: http://svn.apache.org/viewvc?rev=1357813&view=rev
Log:
merge -r 1357810:1357811 from trunk. FIXES: HADOOP-8563
Modified:
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
Modified:
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml?rev=1357813&r1=1357812&r2=1357813&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
Thu Jul 5 19:14:13 2012
@@ -44,11 +44,6 @@
</includes>
<outputDirectory>lib/native</outputDirectory>
</fileSet>
- <fileSet>
- <directory>../hadoop-pipes/target/native/examples</directory>
- <outputDirectory>examples/bin</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
