Author: szetszwo
Date: Thu May 9 23:55:49 2013
New Revision: 1480838
URL: http://svn.apache.org/r1480838
Log:
svn merge --reintegrate
https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802 for merging
HDFS Snapshot feature branch.
Modified:
hadoop/common/trunk/ (props changed)
hadoop/common/trunk/hadoop-project/src/site/site.xml
Propchange: hadoop/common/trunk/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/HDFS-2802:r1360400-1480829
Modified: hadoop/common/trunk/hadoop-project/src/site/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/src/site/site.xml?rev=1480838&r1=1480837&r2=1480838&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/trunk/hadoop-project/src/site/site.xml Thu May 9 23:55:49
2013
@@ -64,6 +64,7 @@
<item name="High Availability With QJM"
href="hadoop-project-dist/hadoop-hdfs/HDFSHighAvailabilityWithQJM.html"/>
<item name="High Availability With NFS"
href="hadoop-project-dist/hadoop-hdfs/HDFSHighAvailabilityWithNFS.html"/>
<item name="Federation"
href="hadoop-project-dist/hadoop-hdfs/Federation.html"/>
+ <item name="HDFS Snapshots"
href="hadoop-project-dist/hadoop-hdfs/HdfsSnapshots.html"/>
<item name="HDFS Architecture"
href="hadoop-project-dist/hadoop-hdfs/HdfsDesign.html"/>
<item name="Edits Viewer"
href="hadoop-project-dist/hadoop-hdfs/HdfsEditsViewer.html"/>
<item name="Image Viewer"
href="hadoop-project-dist/hadoop-hdfs/HdfsImageViewer.html"/>
