Return-Path: 
 <hdfs-commits-return-851-apmail-hadoop-hdfs-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org
Received: (qmail 80876 invoked from network); 23 Sep 2010 18:56:20 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 23 Sep 2010 18:56:20 -0000
Received: (qmail 35189 invoked by uid 500); 23 Sep 2010 18:56:20 -0000
Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org
Received: (qmail 35149 invoked by uid 500); 23 Sep 2010 18:56:19 -0000
Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:hdfs-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:hdfs-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:hdfs-commits@hadoop.apache.org>
List-Id: <hdfs-commits.hadoop.apache.org>
Reply-To: hdfs-dev@hadoop.apache.org
Delivered-To: mailing list hdfs-commits@hadoop.apache.org
Received: (qmail 35141 invoked by uid 99); 23 Sep 2010 18:56:19 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Sep 2010 18:56:19 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 23 Sep 2010 18:56:19 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5205D23888EC; Thu, 23 Sep 2010 18:55:59 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1000577 - in /hadoop/hdfs/branches/branch-0.21:
 CHANGES.txt
 src/docs/src/documentation/content/xdocs/tabs.xml
Date: Thu, 23 Sep 2010 18:55:59 -0000
To: hdfs-commits@hadoop.apache.org
From: shv@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100923185559.5205D23888EC@eris.apache.org>

Author: shv
Date: Thu Sep 23 18:55:58 2010
New Revision: 1000577

URL: http://svn.apache.org/viewvc?rev=1000577&view=rev
Log:
HDFS-1413. Merge -r 1000575:1000576 from trunk to branch 0.21.

Modified:
    hadoop/hdfs/branches/branch-0.21/CHANGES.txt
    hadoop/hdfs/branches/branch-0.21/src/docs/src/documentation/content/xdocs/tabs.xml

Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/CHANGES.txt?rev=1000577&r1=1000576&r2=1000577&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.21/CHANGES.txt Thu Sep 23 18:55:58 2010
@@ -921,6 +921,8 @@ Release 0.21.0 - 2010-08-13
 
     HDFS-1363. Eliminate second synchronized sections in appendFile(). (shv)
 
+    HDFS-1413. Fix broken links to HDFS Wiki. (shv)
+
 Release 0.20.3 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/hdfs/branches/branch-0.21/src/docs/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/src/docs/src/documentation/content/xdocs/tabs.xml?rev=1000577&r1=1000576&r2=1000577&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/src/docs/src/documentation/content/xdocs/tabs.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/src/docs/src/documentation/content/xdocs/tabs.xml Thu Sep 23 18:55:58 2010
@@ -31,7 +31,7 @@
   -->
 
   <tab label="Project" href="http://hadoop.apache.org/hdfs/" />
-  <tab label="Wiki" href="http://wiki.apache.org/hadoop/hdfs" />
+  <tab label="Wiki" href="http://wiki.apache.org/hadoop/HDFS" />
   <tab label="HDFS 0.21 Documentation" dir="" />  
   
 </tabs>