Author: szetszwo
Date: Mon Mar 10 23:40:21 2014
New Revision: 1576130
URL: http://svn.apache.org/r1576130
Log:
svn merge -c 1576128 from branch-2 for HDFS-5535.
Modified:
hadoop/common/branches/branch-2.4/ (props changed)
hadoop/common/branches/branch-2.4/hadoop-project/ (props changed)
hadoop/common/branches/branch-2.4/hadoop-project/src/site/ (props changed)
hadoop/common/branches/branch-2.4/hadoop-project/src/site/site.xml
Propchange: hadoop/common/branches/branch-2.4/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2:r1576128
Merged /hadoop/common/branches/HDFS-5535:r1550130-1574256
Merged /hadoop/common/trunk:r1574259
Propchange: hadoop/common/branches/branch-2.4/hadoop-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-project:r1574259
Merged /hadoop/common/branches/branch-2/hadoop-project:r1576128
Propchange: hadoop/common/branches/branch-2.4/hadoop-project/src/site/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-project/src/site:r1574259
Merged /hadoop/common/branches/branch-2/hadoop-project/src/site:r1576128
Modified: hadoop/common/branches/branch-2.4/hadoop-project/src/site/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-project/src/site/site.xml?rev=1576130&r1=1576129&r2=1576130&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-project/src/site/site.xml
(original)
+++ hadoop/common/branches/branch-2.4/hadoop-project/src/site/site.xml Mon Mar
10 23:40:21 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">
