Merge -r 1227967:1227968 from trunk to branch. FIXES: HADOOP-7936

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

hadoop-assemblies/src/main/resources/assemblies/hadoop-httpfs-dist.xml

@@ -27,14 +27,6 @@
         <include>*</include>
       </includes>
     </fileSet>
-    <!-- Readme, licenses, etc. -->
-    <fileSet>
-      <directory>${basedir}</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>*.txt</include>
-      </includes>
-    </fileSet>
     <fileSet>
       <directory>${basedir}/src/main/sbin</directory>
       <outputDirectory>/sbin</outputDirectory>

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

@@ -119,6 +119,8 @@ Release 0.23.1 - Unreleased
 
    HADOOP-7907. hadoop-tools JARs are not part of the distro. (tucu)
 
+   HADOOP-7936. There's a Hoop README in the root dir of the tarball. (tucu)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES