Return-Path: 
 <mapreduce-commits-return-926-apmail-hadoop-mapreduce-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org
Received: (qmail 40537 invoked from network); 18 Jun 2010 17:54:19 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 18 Jun 2010 17:54:19 -0000
Received: (qmail 95236 invoked by uid 500); 18 Jun 2010 17:54:19 -0000
Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org
Received: (qmail 95158 invoked by uid 500); 18 Jun 2010 17:54:18 -0000
Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:mapreduce-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:mapreduce-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:mapreduce-commits@hadoop.apache.org>
List-Id: <mapreduce-commits.hadoop.apache.org>
Reply-To: mapreduce-dev@hadoop.apache.org
Delivered-To: mailing list mapreduce-commits@hadoop.apache.org
Received: (qmail 95147 invoked by uid 99); 18 Jun 2010 17:54:18 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Jun 2010 17:54:18 +0000
X-ASF-Spam-Status: No, hits=-1393.6 required=10.0
	tests=ALL_TRUSTED,AWL
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, 18 Jun 2010 17:54:17 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B3B8323888D1; Fri, 18 Jun 2010 17:53:31 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r956070 - in /hadoop/mapreduce/trunk: CHANGES.txt
 src/docs/src/documentation/content/xdocs/distcp.xml
Date: Fri, 18 Jun 2010 17:53:31 -0000
To: mapreduce-commits@hadoop.apache.org
From: szetszwo@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100618175331.B3B8323888D1@eris.apache.org>

Author: szetszwo
Date: Fri Jun 18 17:53:31 2010
New Revision: 956070

URL: http://svn.apache.org/viewvc?rev=956070&view=rev
Log:
MAPREDUCE-647. Update distcp forrest documentation to reflect the changes of HADOOP-5472, MAPREDUCE-642 and HADOOP-5620.  Contributed by Rodrigo Schmidt

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/distcp.xml

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=956070&r1=956069&r2=956070&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Fri Jun 18 17:53:31 2010
@@ -54,6 +54,10 @@ Trunk (unreleased changes)
     MAPREDUCE-1516. JobTracker issues delegation tokens only if the user's
     authentication is Kerberos. (Jitendra Pandey via ddas)
 
+    MAPREDUCE-647. Update distcp forrest documentation to reflect the changes
+    of HADOOP-5472, MAPREDUCE-642 and HADOOP-5620.  (Rodrigo Schmidt via
+    szetszwo)
+
   OPTIMIZATIONS
 
     MAPREDUCE-1354. Enhancements to JobTracker for better performance and

Modified: hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/distcp.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/distcp.xml?rev=956070&r1=956069&r2=956070&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/distcp.xml (original)
+++ hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/distcp.xml Fri Jun 18 17:53:31 2010
@@ -56,10 +56,12 @@ bash$ hadoop distcp hdfs://nn1:8020/foo/
         tasks, and start a copy on each TaskTracker from nn1 to nn2. Note
         that DistCp expects absolute paths.</p>
 
-    <p>One can also specify multiple source directories on the command line:</p>
+    <p>One can also specify multiple source directories on the command line and
+    use globbing for one or more source paths:</p>
 <source>
 bash$ hadoop distcp hdfs://nn1:8020/foo/a \ 
-            hdfs://nn1:8020/foo/b \ 
+            hdfs://nn1:8020/foo/b* \
+            hdfs://nn1:8020/foo/car* \
             hdfs://nn2:8020/bar/foo 
 </source>             
 
@@ -116,18 +118,25 @@ hdfs://nn1:8020/foo/b 
         <table>
           <tr><th> Flag </th><th> Description </th><th> Notes </th></tr>
 
-          <tr><td><code>-p[rbugp]</code></td>
+          <tr><td><code>-p[rbugpt]</code></td>
               <td>Preserve<br/>
                   &nbsp;&nbsp;r: replication number<br/>
                   &nbsp;&nbsp;b: block size<br/>
                   &nbsp;&nbsp;u: user<br/>
                   &nbsp;&nbsp;g: group<br/>
-                  &nbsp;&nbsp;p: permission<br/></td>
-              <td>Modification times are not preserved. Also, when
+                  &nbsp;&nbsp;p: permission<br/>
+                  &nbsp;&nbsp;t: modification and access times<br/></td>
+              <td>Notice that when
               <code>-update</code> is specified, status updates will
               <strong>not</strong> be synchronized unless the file sizes
               also differ (i.e. unless the file is re-created).
               </td></tr>
+          <tr><td><code>-basedir &lt;dir&gt;</code></td>
+              <td>Defines new base directory for the copy</td>
+              <td>This option starts the copy from the base directory up to
+              every source, keeping the partial source tree. The specified
+              directory must be a common ancestor to all sources.
+              </td></tr>
           <tr><td><code>-i</code></td>
               <td>Ignore failures</td>
               <td>As explained in the <a href="#etc">Appendix</a>, this option