You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2013/05/31 06:29:27 UTC
svn commit: r1488089 - in /hadoop/common/branches/branch-2: ./
hadoop-project/ hadoop-project/src/site/ hadoop-project/src/site/site.xml
Author: szetszwo
Date: Fri May 31 04:29:20 2013
New Revision: 1488089
URL: http://svn.apache.org/r1488089
Log:
Merge r1480838 and r1480840 from trunk for merging HDFS Snapshot feature.
Modified:
hadoop/common/branches/branch-2/ (props changed)
hadoop/common/branches/branch-2/hadoop-project/ (props changed)
hadoop/common/branches/branch-2/hadoop-project/src/site/ (props changed)
hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml
Propchange: hadoop/common/branches/branch-2/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/HDFS-2802:r1360400-1480829
Merged /hadoop/common/trunk:r1480838,1480840
Propchange: hadoop/common/branches/branch-2/hadoop-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-project:r1480838,1480840
Propchange: hadoop/common/branches/branch-2/hadoop-project/src/site/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-project/src/site:r1480838,1480840
Modified: hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml?rev=1488089&r1=1488088&r2=1488089&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml Fri May 31 04:29:20 2013
@@ -64,6 +64,7 @@
<item name="High Availability With QJM" href="hadoop-yarn/hadoop-yarn-site/HDFSHighAvailabilityWithQJM.html"/>
<item name="High Availability With NFS" href="hadoop-yarn/hadoop-yarn-site/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"/>