merge -r 1357810:1357811 from trunk. FIXES: HADOOP-8563

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357813 13f79535-47bb-0310-9956-ffa450edef68

hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml

@@ -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>

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -131,6 +131,9 @@ Release 2.0.1-alpha - UNRELEASED
     HADOOP-8547. Package hadoop-pipes examples/bin directory (again).
     (Colin Patrick McCabe via eli)
 
+    HADOOP-8563. don't package hadoop-pipes examples/bin
+    (Colin Patrick McCabe via tgraves)
+
   BREAKDOWN OF HDFS-3042 SUBTASKS
 
     HADOOP-8220. ZKFailoverController doesn't handle failure to become active