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 2014/03/21 19:50:57 UTC
svn commit: r1580018 - in /hadoop/common/branches/branch-2/hadoop-project:
./ src/site/ src/site/site.xml
Author: szetszwo
Date: Fri Mar 21 18:50:57 2014
New Revision: 1580018
URL: http://svn.apache.org/r1580018
Log:
svn merge -c 1580013 from trunk for merging site.xml (missing from previous commit)
Modified:
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/hadoop-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-project:r1580013
Propchange: hadoop/common/branches/branch-2/hadoop-project/src/site/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-project/src/site:r1580013
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=1580018&r1=1580017&r2=1580018&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 Mar 21 18:50:57 2014
@@ -69,6 +69,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="ViewFs Guide" href="hadoop-project-dist/hadoop-hdfs/ViewFs.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"/>