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/05 00:53:29 UTC
svn commit: r1574259 - in /hadoop/common/trunk: ./
hadoop-project/src/site/site.xml
Author: szetszwo
Date: Tue Mar 4 23:53:26 2014
New Revision: 1574259
URL: http://svn.apache.org/r1574259
Log:
svn merge --reintegrate https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535 back to trunk.
Modified:
hadoop/common/trunk/ (props changed)
hadoop/common/trunk/hadoop-project/src/site/site.xml
Propchange: hadoop/common/trunk/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/HDFS-5535:r1550130-1574256
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=1574259&r1=1574258&r2=1574259&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/trunk/hadoop-project/src/site/site.xml Tue Mar 4 23:53:26 2014
@@ -83,6 +83,7 @@
href="hadoop-project-dist/hadoop-hdfs/ShortCircuitLocalReads.html"/>
<item name="Centralized Cache Management" href="hadoop-project-dist/hadoop-hdfs/CentralizedCacheManagement.html"/>
<item name="HDFS NFS Gateway" href="hadoop-project-dist/hadoop-hdfs/HdfsNfsGateway.html"/>
+ <item name="HDFS Rolling Upgrade" href="hadoop-project-dist/hadoop-hdfs/HdfsRollingUpgrade.html"/>
</menu>
<menu name="MapReduce" inherit="top">