Return-Path: 
 <hdfs-commits-return-487-apmail-hadoop-hdfs-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org
Received: (qmail 19913 invoked from network); 5 Jan 2010 03:38:30 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 5 Jan 2010 03:38:30 -0000
Received: (qmail 32266 invoked by uid 500); 5 Jan 2010 03:38:30 -0000
Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org
Received: (qmail 32215 invoked by uid 500); 5 Jan 2010 03:38:29 -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 32205 invoked by uid 99); 5 Jan 2010 03:38:29 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jan 2010 03:38:29 +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; Tue, 05 Jan 2010 03:38:27 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9B52823889CB; Tue,  5 Jan 2010 03:38:06 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r895878 - in /hadoop/hdfs/branches/branch-0.21:
 CHANGES.txt
 src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml
Date: Tue, 05 Jan 2010 03:38:06 -0000
To: hdfs-commits@hadoop.apache.org
From: shv@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100105033806.9B52823889CB@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: shv
Date: Tue Jan  5 03:38:05 2010
New Revision: 895878

URL: http://svn.apache.org/viewvc?rev=895878&view=rev
Log:
HDFS-868. Merge -r 895876:895877 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/hdfs_user_guide.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=895878&r1=895877&r2=895878&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.21/CHANGES.txt Tue Jan  5 03:38:05 2010
@@ -511,6 +511,8 @@
     HDFS-762. Balancer causes Null Pointer Exception.
     (Cristian Ivascu via dhruba)
 
+    HDFS-868. Fix link to Hadoop Upgrade Wiki. (Chris A. Mattmann via shv)
+
 Release 0.20.2 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/hdfs/branches/branch-0.21/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml?rev=895878&r1=895877&r2=895878&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml Tue Jan  5 03:38:05 2010
@@ -530,7 +530,7 @@
       of Hadoop and rollback the cluster to the state it was in 
       before
       the upgrade. HDFS upgrade is described in more detail in 
-      <a href="http://wiki.apache.org/hadoop/Hadoop%20Upgrade">Hadoop Upgrade</a> Wiki page.
+      <a href="http://wiki.apache.org/hadoop/Hadoop_Upgrade">Hadoop Upgrade</a> Wiki page.
       HDFS can have one such backup at a time. Before upgrading,
       administrators need to remove existing backup using <code>bin/hadoop
       dfsadmin -finalizeUpgrade</code> command. The following