Return-Path: 
 <common-commits-return-16558-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org>
X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org
Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id F0EBDB215
	for <apmail-hadoop-common-commits-archive@www.apache.org>;
 Fri,  6 Jan 2012 06:00:55 +0000 (UTC)
Received: (qmail 5846 invoked by uid 500); 6 Jan 2012 06:00:54 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 5478 invoked by uid 500); 6 Jan 2012 06:00:41 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Reply-To: common-dev@hadoop.apache.org
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 5365 invoked by uid 99); 6 Jan 2012 06:00:32 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2012 06:00:32 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2012 06:00:30 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 275C82388A39
	for <common-commits@hadoop.apache.org>; Fri,  6 Jan 2012 06:00:09 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1227969 -
 /hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-httpfs-dist.xml
Date: Fri, 06 Jan 2012 06:00:09 -0000
To: common-commits@hadoop.apache.org
From: tucu@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120106060009.275C82388A39@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tucu
Date: Fri Jan  6 06:00:08 2012
New Revision: 1227969

URL: http://svn.apache.org/viewvc?rev=1227969&view=rev
Log:
Merge -r 1227967:1227968 from trunk to branch. FIXES: HADOOP-7936

Modified:
    hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-httpfs-dist.xml

Modified: hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-httpfs-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-httpfs-dist.xml?rev=1227969&r1=1227968&r2=1227969&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-httpfs-dist.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-httpfs-dist.xml Fri Jan  6 06:00:08 2012
@@ -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>