Author: jing9
Date: Fri Sep 20 20:35:45 2013
New Revision: 1525134
URL: http://svn.apache.org/r1525134
Log:
HDFS-5231. Merge change r1525133 from trunk.
Added:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/resources/images/federation-background.gif
- copied unchanged from r1525133,
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/site/resources/images/federation-background.gif
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/resources/images/federation.gif
- copied unchanged from r1525133,
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/site/resources/images/federation.gif
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/Federation.apt.vm
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1525134&r1=1525133&r2=1525134&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Fri Sep 20 20:35:45 2013
@@ -244,6 +244,9 @@ Release 2.1.1-beta - 2013-09-23
HDFS-5219. Add configuration keys for retry policy in WebHDFSFileSystem.
(Haohui Mai via jing9)
+ HDFS-5231. Fix broken links in the document of HDFS Federation. (Haohui Mai
+ via jing9)
+
Release 2.1.0-beta - 2013-08-22
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/Federation.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/Federation.apt.vm?rev=1525134&r1=1525133&r2=1525134&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/Federation.apt.vm
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/Federation.apt.vm
Fri Sep 20 20:35:45 2013
@@ -28,7 +28,7 @@ HDFS Federation
* {Background}
-[./federation-background.gif] HDFS Layers
+[./images/federation-background.gif] HDFS Layers
HDFS has two main layers:
@@ -72,7 +72,7 @@ HDFS Federation
send periodic heartbeats and block reports and handles commands from the
Namenodes.
-[./federation.gif] HDFS Federation Architecture
+[./images/federation.gif] HDFS Federation Architecture
<<Block Pool>>
